江门公安

pom.xml

@@ -113,15 +113,21 @@
             <artifactId>sa-token-dao-redis-jackson</artifactId>
             <version>1.34.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-fyun-oss</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fdkankan</groupId>-->
+<!--            <artifactId>4dkankan-utils-fyun-oss</artifactId>-->
+<!--            <version>3.0.0-SNAPSHOT</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>com.fdkankan</groupId>-->
+<!--            <artifactId>4dkankan-utils-fyun-s3</artifactId>-->
+<!--            <version>3.0.0-SNAPSHOT</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-fyun-s3</artifactId>
+            <artifactId>4dkankan-utils-fyun-local</artifactId>
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
 

src/main/java/com/fdkankan/openApi/constant/JmgaConstant.java

@@ -0,0 +1,12 @@
+package com.fdkankan.openApi.constant;
+
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+public class JmgaConstant {
+
+    public static final String API_ADD_UCENTER_USER = "/service/manage/inner/addUcenterUser";
+
+    public static final String API_DEL_UCENTER_USER = "/service/manage/inner/delUcenterUser";
+
+}

src/main/java/com/fdkankan/openApi/controller/system/AccountController.java

@@ -1,6 +1,15 @@
 package com.fdkankan.openApi.controller.system;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.fdkankan.openApi.service.system.IAccountService;
+import com.fdkankan.openApi.vo.system.CreateAppUser4JmgaParamVo;
+import com.fdkankan.openApi.vo.system.CreateAppUserParamVo;
+import com.fdkankan.web.response.ResultData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -14,8 +23,19 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-05-18
  */
 @RestController
-@RequestMapping("/openApi/account")
+@RequestMapping("/account")
 public class AccountController {
 
+    @Autowired
+    IAccountService accountService;
+
+    @SaIgnore
+    @PostMapping("create")
+    public ResultData createApp(@RequestBody @Validated CreateAppUser4JmgaParamVo param){
+        return accountService.createApp4Jmga(param);
+    }
+
+
+
 }
 

src/main/java/com/fdkankan/openApi/controller/www/JySceneAuthController.java

@@ -0,0 +1,41 @@
+package com.fdkankan.openApi.controller.www;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.fdkankan.openApi.aop.ValidateApi;
+import com.fdkankan.openApi.service.www.IJySceneAuthService;
+import com.fdkankan.openApi.vo.BaseSceneParamVo;
+import com.fdkankan.openApi.vo.www.UpdateJySceneAuthParamVo;
+import com.fdkankan.web.response.ResultData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@RestController
+@RequestMapping("/jySceneAuth")
+public class JySceneAuthController {
+
+    @Autowired
+    private IJySceneAuthService jySceneAuthService;
+
+    @SaIgnore
+    @ValidateApi
+    @PostMapping("updateAuth")
+    public ResultData updateAuth(@Validated @RequestBody UpdateJySceneAuthParamVo param){
+        return jySceneAuthService.updateAuth(param);
+    }
+
+}
+

src/main/java/com/fdkankan/openApi/controller/www/JySceneUserAuthController.java

@@ -0,0 +1,55 @@
+package com.fdkankan.openApi.controller.www;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.fdkankan.openApi.aop.ValidateApi;
+import com.fdkankan.openApi.service.www.IJySceneUserAuthService;
+import com.fdkankan.openApi.vo.system.JmgaGetAuthParamVo;
+import com.fdkankan.openApi.vo.www.DeleteSceneUserAuthParamVo;
+import com.fdkankan.openApi.vo.www.SaveSceneUserAuthParamVo;
+import com.fdkankan.web.response.ResultData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-09-11
+ */
+@RestController
+@RequestMapping("/jySceneUserAuth")
+public class JySceneUserAuthController {
+
+    @Autowired
+    private IJySceneUserAuthService jySceneUserAuthService;
+
+    @ValidateApi
+    @SaIgnore
+    @GetMapping("/pageListAuth")
+    public ResultData pageListAuth(@Validated @RequestBody JmgaGetAuthParamVo param){
+        return jySceneUserAuthService.pageListAuth(param);
+    }
+
+    @ValidateApi
+    @SaIgnore
+    @PostMapping("/saveSceneUserAuth")
+    public ResultData saveSceneUserAuth(@Validated @RequestBody SaveSceneUserAuthParamVo param){
+        return jySceneUserAuthService.saveSceneUserAuth(param);
+    }
+
+    @ValidateApi
+    @SaIgnore
+    @PostMapping("/deleteSceneUserAuth")
+    public ResultData deleteSceneUserAuth(@Validated @RequestBody DeleteSceneUserAuthParamVo param){
+        jySceneUserAuthService.deleteSceneUserAuth(param);
+        return ResultData.ok();
+    }
+
+
+
+}
+

src/main/java/com/fdkankan/openApi/controller/www/JyUserController.java

@@ -0,0 +1,60 @@
+package com.fdkankan.openApi.controller.www;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.crypto.asymmetric.RSA;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.util.AesUtil;
+import com.fdkankan.openApi.aop.ValidateApi;
+import com.fdkankan.openApi.entity.www.JyUser;
+import com.fdkankan.openApi.service.www.IJyUserService;
+import com.fdkankan.openApi.vo.www.DelJyUserParamVo;
+import com.fdkankan.openApi.vo.www.SaveJyUserParamVo;
+import com.fdkankan.web.response.ResultData;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.bouncycastle.jcajce.provider.asymmetric.rsa.RSAUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@RestController
+@RequestMapping("/jyUser")
+public class JyUserController {
+
+    @Autowired
+    private IJyUserService jyUserService;
+
+    @SaIgnore
+    @ValidateApi
+    @PostMapping("/addUcenterUser")
+    public ResultData addUcenterUser(@Validated @RequestBody SaveJyUserParamVo param){
+        return jyUserService.addUcenterUser(param);
+    }
+
+    @SaIgnore
+    @ValidateApi
+    @PostMapping("/delUcenterUser")
+    public ResultData delUcenterUser(@Validated @RequestBody DelJyUserParamVo param){
+        return jyUserService.delUcenterUser(param);
+    }
+
+}
+

src/main/java/com/fdkankan/openApi/entity/www/JySceneAuth.java

@@ -0,0 +1,54 @@
+package com.fdkankan.openApi.entity.www;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@Getter
+@Setter
+@TableName("jy_scene_auth")
+public class JySceneAuth implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 0授权用户，1公开浏览
+     */
+    @TableField("auth_type")
+    private Integer authType;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A", delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/openApi/entity/www/JySceneUserAuth.java

@@ -0,0 +1,93 @@
+package com.fdkankan.openApi.entity.www;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@Getter
+@Setter
+@TableName("jy_scene_user_auth")
+public class JySceneUserAuth implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    @TableField("jy_user_id")
+    private Integer jyUserId;
+
+    /**
+     * 是否有浏览权限0否，1不限时查看，2限时查看
+     */
+    @TableField("look_auth")
+    private Integer lookAuth;
+
+    /**
+     * 是否有编辑权限0否，1不限时编辑，2限时编辑
+     */
+    @TableField("edit_auth")
+    private Integer editAuth;
+
+    /**
+     * 浏览截止时间
+     */
+    @TableField("look_end_time")
+    private Date lookEndTime;
+
+    /**
+     * 编辑截止时间
+     */
+    @TableField("edit_end_time")
+    private Date editEndTime;
+
+    /**
+     * 是否有授权他人权限，0否，1是
+     */
+    @TableField("is_author")
+    private Integer isAuthor;
+
+    /**
+     * 是否有授权他人查看权限 0否，1是
+     */
+    @TableField("can_auth_look")
+    private Integer canAuthLook;
+
+    /**
+     * 是否有授权他人编辑权限 0 否，1是
+     */
+    @TableField("can_edit_look")
+    private Integer canEditLook;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A", delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/openApi/entity/www/JyUser.java

@@ -0,0 +1,69 @@
+package com.fdkankan.openApi.entity.www;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@Getter
+@Setter
+@TableName("jy_user")
+public class JyUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 人员id
+     */
+    @TableField("ry_id")
+    private String ryId;
+
+    /**
+     * 密码
+     */
+    @TableField("ry_password")
+    private String ryPassword;
+
+    /**
+     * 编号
+     */
+    @TableField("ry_no")
+    private String ryNo;
+
+    @TableField("ry_nick_name")
+    private String ryNickName;
+
+    @TableField("user_id")
+    private Integer userId;
+
+    @TableField("sys_user_id")
+    private Integer sysUserId;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A", delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/openApi/exception/OpenApiGlobalExceptionHandler.java

@@ -7,11 +7,18 @@ import com.fdkankan.web.exception.GlobalExceptionHandler;
 import com.fdkankan.web.response.ResultData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
+import org.springframework.validation.BindException;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+import java.util.List;
+
 /**
  * 全局异常处理器
  */
@@ -38,4 +45,34 @@ public class OpenApiGlobalExceptionHandler extends GlobalExceptionHandler {
         log.error("业务异常code:{},message:{}", e.getCode(), e.getMessage());
         return ResultData.error(e.getCode(), e.getMessage());
     }
+
+    @ResponseBody
+    @ExceptionHandler({BindException.class, MethodArgumentNotValidException.class})
+    public ResultData validationBodyException(Exception e) {
+        BindingResult result = null;
+        if (e instanceof MethodArgumentNotValidException) {
+            result = ((MethodArgumentNotValidException)e).getBindingResult();
+        }
+
+        if (e instanceof BindException) {
+            result = ((BindException)e).getBindingResult();
+        }
+
+        String message = "";
+        if (result.hasErrors()) {
+            List<ObjectError> errors = result.getAllErrors();
+            if (errors != null) {
+                errors.forEach((p) -> {
+                    FieldError fieldError = (FieldError)p;
+                    log.error("参数校验错误：类:{},字段：{},错误信息：{}", new Object[]{fieldError.getObjectName(), fieldError.getField(), fieldError.getDefaultMessage()});
+                });
+                if (errors.size() > 0) {
+                    FieldError fieldError = (FieldError)errors.get(0);
+                    message = fieldError.getField().concat(fieldError.getDefaultMessage());
+                }
+            }
+        }
+
+        return ResultData.error(ErrorCode.PARAM_REQUIRED.code(), message);
+    }
 }

src/main/java/com/fdkankan/openApi/generate/AutoGenerate.java

@@ -21,7 +21,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"openApi", getTables(new String[]{
-                "t_scene_cooperation",
+                "jy_scene_auth"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -49,8 +49,8 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        FastAutoGenerator.create("jdbc:mysql://120.24.144.164:3306/4dkankan_v4",
-                "root","4Dage@4Dage#@168")
+        FastAutoGenerator.create("jdbc:mysql://192.168.0.25:3306/4dkankan_v4",
+                "root","4dkk2023cuikuan%")
                 .globalConfig(builder -> {
                     builder.author("")               //作者
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)
@@ -73,7 +73,7 @@ public class AutoGenerate {
                 })
                 .strategyConfig(builder -> {
                     builder.addInclude(tables)
-                            .addTablePrefix("t_")
+//                            .addTablePrefix("t_")
 
                             .serviceBuilder()
                             .formatServiceFileName("I%sService")

src/main/java/com/fdkankan/openApi/httpclient/client/FdKKClient.java

@@ -1,13 +1,13 @@
 package com.fdkankan.openApi.httpclient.client;
 
-import com.dtflys.forest.annotation.Address;
-import com.dtflys.forest.annotation.JSONBody;
-import com.dtflys.forest.annotation.Post;
-import com.dtflys.forest.annotation.Success;
+import com.dtflys.forest.annotation.*;
+import com.dtflys.forest.callback.OnError;
+import com.dtflys.forest.callback.OnSuccess;
 import com.fdkankan.openApi.httpclient.address.FdkkAddressSource;
 import com.fdkankan.openApi.httpclient.callback.SuccessCondition;
 import com.fdkankan.openApi.vo.www.FdkkLoginVo;
 import com.fdkankan.web.response.Result;
+import com.fdkankan.web.response.ResultData;
 
 /**
  * 获取，调用4dkk服务
@@ -22,5 +22,10 @@ public interface FdKKClient {
     @Post("/api/sso/user/login")
     Result<FdkkLoginVo> fdkkLogin(@JSONBody Object param);
 
+    @Post(
+            url="{url}"
+    )
+    ResultData post(@Var("url") String url, @JSONBody Object param);
+
 
 }

src/main/java/com/fdkankan/openApi/mapper/www/IJySceneAuthMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.openApi.mapper.www;
+
+import com.fdkankan.openApi.entity.www.JySceneAuth;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@Mapper
+public interface IJySceneAuthMapper extends BaseMapper<JySceneAuth> {
+
+}

src/main/java/com/fdkankan/openApi/mapper/www/IJySceneUserAuthMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.openApi.mapper.www;
+
+import com.fdkankan.openApi.entity.www.JySceneUserAuth;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@Mapper
+public interface IJySceneUserAuthMapper extends BaseMapper<JySceneUserAuth> {
+
+}

src/main/java/com/fdkankan/openApi/mapper/www/IJyUserMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.openApi.mapper.www;
+
+import com.fdkankan.openApi.entity.www.JyUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@Mapper
+public interface IJyUserMapper extends BaseMapper<JyUser> {
+
+}

src/main/java/com/fdkankan/openApi/mq/listener/CallApiListener.java

@@ -37,34 +37,34 @@ public class CallApiListener {
      * @param message
      * @throws Exception the io exception  这里异常需要处理
      */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.openApi.call-api}"),
-            concurrency = "${maxThread.openApi.update-count}"
-
-    )
-    public void callApi(Channel channel, Message message) throws Exception {
-        if (ObjectUtils.isEmpty(message.getBody())) {
-            log.error("消息内容为空,退出构建,当前服务器id:{}");
-            return;
-        }
-        long deliveryTag = message.getMessageProperties().getDeliveryTag();
-        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-        String messageId = message.getMessageProperties().getMessageId();
-
-        try {
-            log.info("callApi开始,id:{},deliveryTag:{},消息体:{}", messageId, deliveryTag, msg);
-            CallApiDTO param = JSONObject.parseObject(msg, CallApiDTO.class);
-            if (StrUtil.isNotEmpty(param.getAppKey())){
-                userAuthService.incrCallCount(param.getAppKey());
-            }
-            channel.basicAck(deliveryTag, false);
-        } catch (DeadlockLoserDataAccessException e) {
-            log.info("修改死锁重新入队");
-            channel.basicReject(deliveryTag, true);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+//    @RabbitListener(
+//            queuesToDeclare = @Queue("${queue.openApi.call-api}"),
+//            concurrency = "${maxThread.openApi.update-count}"
+//
+//    )
+//    public void callApi(Channel channel, Message message) throws Exception {
+//        if (ObjectUtils.isEmpty(message.getBody())) {
+//            log.error("消息内容为空,退出构建,当前服务器id:{}");
+//            return;
+//        }
+//        long deliveryTag = message.getMessageProperties().getDeliveryTag();
+//        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
+//        String messageId = message.getMessageProperties().getMessageId();
+//
+//        try {
+//            log.info("callApi开始,id:{},deliveryTag:{},消息体:{}", messageId, deliveryTag, msg);
+//            CallApiDTO param = JSONObject.parseObject(msg, CallApiDTO.class);
+//            if (StrUtil.isNotEmpty(param.getAppKey())){
+//                userAuthService.incrCallCount(param.getAppKey());
+//            }
+//            channel.basicAck(deliveryTag, false);
+//        } catch (DeadlockLoserDataAccessException e) {
+//            log.info("修改死锁重新入队");
+//            channel.basicReject(deliveryTag, true);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
 
 //    @RabbitListener(
 //            queuesToDeclare = @Queue(name = "test_priority", arguments = {@Argument(name = "x-max-priority", value = "30", type = "java.lang.Integer")}),

src/main/java/com/fdkankan/openApi/mq/sender/CallApiSender.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
 @Service
 @Slf4j
 public class CallApiSender {
-    @Value("${queue.openApi.call-api}")
+//    @Value("${queue.openApi.call-api}")
     private String callApi;
     @Autowired
     private RabbitMqProducer rabbitMqProducer;

src/main/java/com/fdkankan/openApi/service/system/IAccountService.java

@@ -30,4 +30,6 @@ public interface IAccountService extends IService<Account> {
 
     ResultData listApp(PageAppUserParamVo param);
 
+    ResultData createApp4Jmga(CreateAppUser4JmgaParamVo param);
+
 }

src/main/java/com/fdkankan/openApi/service/system/impl/AccountServiceImpl.java

@@ -32,6 +32,7 @@ import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
 import java.util.List;
 import java.util.Objects;
 
@@ -231,4 +232,40 @@ public class AccountServiceImpl extends ServiceImpl<IAccountMapper, Account> imp
         }
         return ResultData.ok(PageInfo.PageInfo(appUserVoPage));
     }
+
+    @Override
+    public ResultData createApp4Jmga(CreateAppUser4JmgaParamVo param) {
+        Account account = this.getOne(new LambdaQueryWrapper<Account>().eq(Account::getUserName, param.getUserName()));
+        if(Objects.nonNull(account)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_10002);
+        }
+        if(param.getState() != CommonStatus.NO.code().intValue()
+                && param.getState() != CommonStatus.YES.code().intValue()){
+            throw new BusinessException(ErrorCode.PARAM_ERROR);
+        }
+        Integer count = param.getCount();
+        if(CountType.NO_LIMIT.code() != param.getCountType() && (Objects.isNull(count) || count < 1)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_10004);
+        }else{
+            count = -1;
+        }
+        account = new Account();
+        account.setUserName(param.getUserName());
+        account.setCustomerName(param.getUserName());
+        account.setDescription(param.getDescription());
+        account.setCreaterId(param.getCreaterId());
+        this.save(account);
+
+        UserAuthInfo userAuthInfo = new UserAuthInfo();
+        userAuthInfo.setAccountId(account.getId());
+        userAuthInfo.setAppKey(TokenUtil.createToken());
+        userAuthInfo.setTotalCount(count);
+        userAuthInfo.setCallCount(0);
+        userAuthInfo.setState(param.getState());
+        userAuthInfo.setEffectTime(Calendar.getInstance().getTime());
+        userAuthInfo.setCreaterId(param.getCreaterId());
+        userAuthService.save(userAuthInfo);
+
+        return ResultData.ok(userAuthInfo.getAppKey());
+    }
 }

src/main/java/com/fdkankan/openApi/service/www/IJySceneAuthService.java

@@ -0,0 +1,20 @@
+package com.fdkankan.openApi.service.www;
+
+import com.fdkankan.openApi.entity.www.JySceneAuth;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.openApi.vo.www.UpdateJySceneAuthParamVo;
+import com.fdkankan.web.response.ResultData;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+public interface IJySceneAuthService extends IService<JySceneAuth> {
+
+    ResultData updateAuth(UpdateJySceneAuthParamVo param);
+
+}

src/main/java/com/fdkankan/openApi/service/www/IJySceneUserAuthService.java

@@ -0,0 +1,32 @@
+package com.fdkankan.openApi.service.www;
+
+import com.fdkankan.openApi.entity.www.JySceneUserAuth;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.openApi.vo.system.JmgaGetAuthParamVo;
+import com.fdkankan.openApi.vo.www.DeleteSceneUserAuthParamVo;
+import com.fdkankan.openApi.vo.www.SaveSceneUserAuthParamVo;
+import com.fdkankan.web.response.ResultData;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-09-11
+ */
+public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
+
+    ResultData pageListAuth(JmgaGetAuthParamVo param);
+
+    ResultData saveSceneUserAuth(SaveSceneUserAuthParamVo param);
+
+    List<JySceneUserAuth> listByNumAndJyUserIds(String num, Set<Integer> jyUserIds);
+
+    void deleteSceneUserAuth(DeleteSceneUserAuthParamVo param);
+}

src/main/java/com/fdkankan/openApi/service/www/IJyUserService.java

@@ -0,0 +1,34 @@
+package com.fdkankan.openApi.service.www;
+
+import com.fdkankan.openApi.entity.www.JyUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.openApi.vo.www.DelJyUserParamVo;
+import com.fdkankan.openApi.vo.www.SaveJyUserParamVo;
+import com.fdkankan.web.response.ResultData;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+public interface IJyUserService extends IService<JyUser> {
+
+    JyUser getByUserName(String userName);
+
+    JyUser getByRyId(String userName);
+
+    List<JyUser> listByRyNos(Set<String> ryNoSet);
+
+    List<JyUser> listByRyIds(Set<String> ryIdSet);
+
+    ResultData addUcenterUser(SaveJyUserParamVo param);
+
+    ResultData delUcenterUser(DelJyUserParamVo param);
+
+}

src/main/java/com/fdkankan/openApi/service/www/impl/JySceneAuthServiceImpl.java

@@ -0,0 +1,54 @@
+package com.fdkankan.openApi.service.www.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.openApi.entity.www.JySceneAuth;
+import com.fdkankan.openApi.entity.www.ScenePlus;
+import com.fdkankan.openApi.mapper.www.IJySceneAuthMapper;
+import com.fdkankan.openApi.service.www.IJySceneAuthService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.openApi.service.www.IScenePlusService;
+import com.fdkankan.openApi.vo.www.UpdateJySceneAuthParamVo;
+import com.fdkankan.web.response.ResultData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-09-11
+ */
+@DS("www")
+@Service
+public class JySceneAuthServiceImpl extends ServiceImpl<IJySceneAuthMapper, JySceneAuth> implements IJySceneAuthService {
+
+    @Autowired
+    private IScenePlusService scenePlusService;
+
+    @Override
+    public ResultData updateAuth(UpdateJySceneAuthParamVo param) {
+        String num = param.getNum();
+
+        ScenePlus scenePlus = scenePlusService.getByNum(num);
+        if(Objects.isNull(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+
+        JySceneAuth jySceneAuth = this.getOne(new LambdaQueryWrapper<JySceneAuth>().eq(JySceneAuth::getNum, num));
+        if(Objects.isNull(jySceneAuth)){
+            jySceneAuth = new JySceneAuth();
+        }
+        jySceneAuth.setNum(num);
+        jySceneAuth.setAuthType(param.getAuthType());
+        this.saveOrUpdate(jySceneAuth);
+
+        return ResultData.ok();
+    }
+}

src/main/java/com/fdkankan/openApi/service/www/impl/JySceneUserAuthServiceImpl.java

@@ -0,0 +1,139 @@
+package com.fdkankan.openApi.service.www.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.openApi.common.PageInfo;
+import com.fdkankan.openApi.entity.www.JySceneUserAuth;
+import com.fdkankan.openApi.entity.www.JyUser;
+import com.fdkankan.openApi.entity.www.ScenePlus;
+import com.fdkankan.openApi.mapper.www.IJySceneUserAuthMapper;
+import com.fdkankan.openApi.service.www.IJySceneUserAuthService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.openApi.service.www.IJyUserService;
+import com.fdkankan.openApi.service.www.IScenePlusService;
+import com.fdkankan.openApi.vo.system.JmgaGetAuthParamVo;
+import com.fdkankan.openApi.vo.www.DeleteSceneUserAuthParamVo;
+import com.fdkankan.openApi.vo.www.SaveSceneUserAuthParamVo;
+import com.fdkankan.openApi.vo.www.SceneUserAuthParam;
+import com.fdkankan.web.response.ResultData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-09-11
+ */
+@DS("www")
+@Service
+public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapper, JySceneUserAuth> implements IJySceneUserAuthService {
+
+    @Autowired
+    private IJyUserService jyUserService;
+    @Autowired
+    private IScenePlusService scenePlusService;
+
+
+    @Override
+    public ResultData pageListAuth(JmgaGetAuthParamVo param) {
+        JyUser jyUser = jyUserService.getByRyId(param.getRyId());
+        if(Objects.isNull(jyUser)){
+            throw new BusinessException(ErrorCode.USER_NOT_EXIST);
+        }
+        Page page = this.page(new Page(param.getPageNum(), param.getPageSize()), new LambdaQueryWrapper<JySceneUserAuth>().eq(JySceneUserAuth::getJyUserId, jyUser.getId()));
+
+        return ResultData.ok(PageInfo.PageInfo(page));
+    }
+
+    @Override
+    public ResultData saveSceneUserAuth(SaveSceneUserAuthParamVo param) {
+
+        String num = param.getNum();
+
+        ScenePlus scenePlus = scenePlusService.getByNum(num);
+        if(Objects.isNull(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+
+        //校验参数
+        List<SceneUserAuthParam> sceneAuthList = param.getSceneAuthList();
+        Set<String> ryIdSet = sceneAuthList.stream().map(auth -> {
+            if (auth.getLookAuth() == 2 && Objects.isNull(auth.getLookEndTime())) {
+                throw new BusinessException(ErrorCode.PARAM_ERROR.code(), "场景限时查看时，lookEndTime不能为空");
+            }
+
+            if (auth.getEditAuth() == 2 && Objects.isNull(auth.getEditEndTime())) {
+                throw new BusinessException(ErrorCode.PARAM_ERROR.code(), "场景限时编辑时，editEndTime不能为空");
+            }
+            return auth.getRyId();
+        }).collect(Collectors.toSet());
+
+        //校验账号是否存在
+        List<JyUser> jyUserList = jyUserService.listByRyIds(ryIdSet);
+        Map<String, Integer> ryIdMap = jyUserList.stream().collect(Collectors.toMap(JyUser::getRyId, JyUser::getId));
+        Set<String> notExistList = ryIdSet.stream().filter(ryId -> {
+            if (ryIdMap.containsKey(ryId)) {
+                return false;
+            }
+            return true;
+        }).collect(Collectors.toSet());
+        if(CollUtil.isNotEmpty(notExistList)){
+            throw new BusinessException(ErrorCode.USER_NOT_EXIST.code(), JSON.toJSONString(notExistList).concat("用户不存在"));
+        }
+
+        //校验权限是否已存在
+        List<JySceneUserAuth> dbAuthList = this.listByNumAndJyUserIds(num, ryIdMap.values().stream().collect(Collectors.toSet()));
+        Map<Integer, Integer> dbAuthMap = dbAuthList.stream().collect(Collectors.toMap(JySceneUserAuth::getJyUserId, JySceneUserAuth::getId));
+
+        List<JySceneUserAuth> jySceneUserAuthList = sceneAuthList.stream().map(item -> {
+            Integer id = dbAuthMap.get(ryIdMap.get(item.getRyId()));
+            JySceneUserAuth jySceneUserAuth = BeanUtil.copyProperties(item, JySceneUserAuth.class);
+            jySceneUserAuth.setNum(num);
+            jySceneUserAuth.setJyUserId(ryIdMap.get(item.getRyId()));
+            jySceneUserAuth.setId(id);
+            return jySceneUserAuth;
+        }).collect(Collectors.toList());
+
+        this.saveOrUpdateBatch(jySceneUserAuthList);
+
+
+        return ResultData.ok();
+    }
+
+    @Override
+    public List<JySceneUserAuth> listByNumAndJyUserIds(String num, Set<Integer> jyUserIds) {
+        return this.list(new LambdaQueryWrapper<JySceneUserAuth>().eq(JySceneUserAuth::getNum, num).in(JySceneUserAuth::getJyUserId, jyUserIds));
+    }
+
+    @Override
+    public void deleteSceneUserAuth(DeleteSceneUserAuthParamVo param) {
+
+        ScenePlus scenePlus = scenePlusService.getByNum(param.getNum());
+        if(Objects.isNull(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+
+        List<JyUser> jyUsers = jyUserService.listByRyIds(param.getRyIdList());
+        if(CollUtil.isEmpty(jyUsers)){
+            return;
+        }
+        Set<Integer> jyUserIds = jyUsers.stream().map(JyUser::getId).collect(Collectors.toSet());
+        this.remove(new LambdaQueryWrapper<JySceneUserAuth>().eq(JySceneUserAuth::getNum, param.getNum()).in(JySceneUserAuth::getJyUserId, jyUserIds));
+    }
+}

src/main/java/com/fdkankan/openApi/service/www/impl/JyUserServiceImpl.java

@@ -0,0 +1,72 @@
+package com.fdkankan.openApi.service.www.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.openApi.constant.JmgaConstant;
+import com.fdkankan.openApi.entity.www.JyUser;
+import com.fdkankan.openApi.httpclient.callback.ErrorCallback;
+import com.fdkankan.openApi.httpclient.callback.SuccessCallback;
+import com.fdkankan.openApi.httpclient.client.FdKKClient;
+import com.fdkankan.openApi.mapper.www.IJyUserMapper;
+import com.fdkankan.openApi.service.www.IJyUserService;
+import com.fdkankan.openApi.vo.www.DelJyUserParamVo;
+import com.fdkankan.openApi.vo.www.SaveJyUserParamVo;
+import com.fdkankan.web.response.ResultData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-09-11
+ */
+@DS("www")
+@Service
+public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implements IJyUserService {
+
+    @Resource
+    private FdKKClient fdKKClient;
+
+    @Override
+    public JyUser getByUserName(String userName) {
+        return this.getOne(new LambdaQueryWrapper<JyUser>().eq(JyUser::getRyNo, userName));
+    }
+
+    @Override
+    public JyUser getByRyId(String ryId) {
+        return this.getOne(new LambdaQueryWrapper<JyUser>().eq(JyUser::getRyId, ryId));
+    }
+
+    @Override
+    public List<JyUser> listByRyNos(Set<String> ryNoSet) {
+        return this.list(new LambdaQueryWrapper<JyUser>().in(JyUser::getRyNo, ryNoSet));
+    }
+
+    @Override
+    public List<JyUser> listByRyIds(Set<String> ryIdSet) {
+        return this.list(new LambdaQueryWrapper<JyUser>().in(JyUser::getRyId, ryIdSet));
+    }
+
+    @Override
+    public ResultData addUcenterUser(SaveJyUserParamVo param) {
+        if(StrUtil.isEmpty(param.getNickName())){
+            param.setNickName(param.getRyNo());
+        }
+
+        return fdKKClient.post(JmgaConstant.API_ADD_UCENTER_USER, param);
+    }
+
+    @Override
+    public ResultData delUcenterUser(DelJyUserParamVo param) {
+        return fdKKClient.post(JmgaConstant.API_DEL_UCENTER_USER, param);
+    }
+}

src/main/java/com/fdkankan/openApi/service/www/impl/SceneMarkShapeServiceImpl.java

@@ -47,7 +47,7 @@ import java.util.Objects;
 public class SceneMarkShapeServiceImpl extends ServiceImpl<IMarkShapeMapper, SceneMarkShape> implements ISceneMarkShapeService {
     @Autowired
     private RabbitMqProducer rabbitMqProducer;
-    @Value("${queue.scene.yolov5-train-queue}")
+//    @Value("${queue.scene.yolov5-train-queue}")
     private String yolov5TrainQueue;
     @Value("${main.url}")
     private String mainUrl;

src/main/java/com/fdkankan/openApi/vo/system/CreateAppUser4JmgaParamVo.java

@@ -0,0 +1,56 @@
+package com.fdkankan.openApi.vo.system;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+public class CreateAppUser4JmgaParamVo {
+
+    /**
+     * 账号
+     */
+    @NotBlank(message = "userName不能为空")
+    private String userName;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 客户描述
+     */
+    private String description;
+
+    /**
+     * 次数类型（-1-无限制，1-具体次数）
+     */
+    private Integer countType = -1;
+
+    /**
+     * api调用次数
+     */
+    private Integer count;
+
+    /**
+     * 启用状态（0-否，1-是）
+     */
+    @NotNull(message = "state不能为空")
+    private Integer state;
+
+    /**
+     * 生效时间
+     */
+    private Date effectTime;
+
+    /**
+     * 创建人id（对应管理后台用户id）
+     */
+    private Long createrId;
+
+
+
+
+}

src/main/java/com/fdkankan/openApi/vo/system/JmgaGetAuthParamVo.java

@@ -0,0 +1,15 @@
+package com.fdkankan.openApi.vo.system;
+
+import com.fdkankan.web.request.RequestBase;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class JmgaGetAuthParamVo extends RequestBase {
+
+    @NotBlank
+    private String ryId;
+
+
+}

src/main/java/com/fdkankan/openApi/vo/www/DelJyUserParamVo.java

@@ -0,0 +1,17 @@
+package com.fdkankan.openApi.vo.www;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DelJyUserParamVo {
+
+    @NotBlank(message = "不能为空")
+    private String ryId;
+
+}

src/main/java/com/fdkankan/openApi/vo/www/DeleteSceneUserAuthParamVo.java

@@ -0,0 +1,21 @@
+package com.fdkankan.openApi.vo.www;
+
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+import java.util.Set;
+
+@Data
+public class DeleteSceneUserAuthParamVo {
+
+    @NotBlank(message = "不能为空")
+    private String num;
+
+    @NotEmpty(message = "不能为空")
+    private Set<String> ryIdList;
+}
+
+

src/main/java/com/fdkankan/openApi/vo/www/SaveJyUserParamVo.java

@@ -0,0 +1,23 @@
+package com.fdkankan.openApi.vo.www;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SaveJyUserParamVo {
+
+    private String nickName;
+
+    @NotBlank(message = "不能为空")
+    private String password;
+
+    @NotBlank(message = "不能为空")
+    private String ryId;
+    @NotBlank(message = "不能为空")
+    private String ryNo;
+}

src/main/java/com/fdkankan/openApi/vo/www/SaveSceneUserAuthParamVo.java

@@ -0,0 +1,21 @@
+package com.fdkankan.openApi.vo.www;
+
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class SaveSceneUserAuthParamVo {
+
+    @NotBlank(message = "不能为空")
+    private String num;
+
+    @Valid
+    @NotEmpty(message = "不能为空")
+    private List<SceneUserAuthParam> sceneAuthList;
+}
+
+

src/main/java/com/fdkankan/openApi/vo/www/SceneUserAuthParam.java

@@ -0,0 +1,67 @@
+package com.fdkankan.openApi.vo.www;
+
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+public class SceneUserAuthParam{
+
+    @NotBlank(message = "不能为空")
+    private String ryId;
+
+    /**
+     * 是否有浏览权限0否，1不限时查看，2限时查看
+     */
+    @NotNull(message = "不能为空")
+    @Min(1)
+    @Max(2)
+    private Integer lookAuth;
+
+    /**
+     * 是否有编辑权限0否，1不限时编辑，2限时编辑
+     */
+    @NotNull(message = "不能为空")
+    @Min(1)
+    @Max(2)
+    private Integer editAuth;
+
+    /**
+     * 浏览截止时间
+     */
+    private Date lookEndTime;
+
+    /**
+     * 编辑截止时间
+     */
+    private Date editEndTime;
+
+    /**
+     * 是否有授权他人权限，0否，1是
+     */
+    @NotNull(message = "不能为空")
+    @Min(0)
+    @Max(1)
+    private Integer isAuthor;
+
+    /**
+     * 是否有授权他人查看权限 0否，1是
+     */
+    @NotNull(message = "不能为空")
+    @Min(0)
+    @Max(1)
+    private Integer canAuthLook;
+
+    /**
+     * 是否有授权他人编辑权限 0 否，1是
+     */
+    @NotNull(message = "不能为空")
+    @Min(0)
+    @Max(21)
+    private Integer canEditLook;
+
+}

src/main/java/com/fdkankan/openApi/vo/www/UpdateJySceneAuthParamVo.java

@@ -0,0 +1,21 @@
+package com.fdkankan.openApi.vo.www;
+
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class UpdateJySceneAuthParamVo {
+
+    @NotBlank(message = "不能为空")
+    private String num;
+
+
+    @NotNull(message = "不能为空")
+    @Min(0)
+    @Max(1)
+    private Integer authType;
+}

src/main/resources/banner.txt

@@ -1,158 +0,0 @@
-...................o888888o.o88888888o.
-.................8888888888888888888888888o.
-...............888::::888888888888888888888888o.
-.............88::::::::88888888888888888888888888o.
-...........o8:::::::::888::顶88888888888888888888888.
-..........8888:8::::::8:::::::::顶88888888888888888888.
-.........8888::::8888::::::::::::::::顶88888888888 ''''88
-........8888:::888888888::::::::::::::::顶888888888 8
-.......88.88888888888888888:::::::::::::顶88888888888
-......88..888888888888888888:::::::::::顶88888888888888
-......88.888888888888888888888::::::::顶88888888888888888
-......8..8888888888888888888888::::::顶88888888888888888888
-........8888888888888888::88888:::::顶8888888888888888888888
-......88888888888888888::::8888::::顶8888888888888888 ''''8888
-.....88888888888888888::::8888::::顶:8::***::888888888 888
-....88888888888888888::::888:::::顶::::*EYE*::888888888 88
-..888888888888888888::::88::::::顶:::::::::::::888888888 88
-.8888888888888888888::::8::::::顶:::::::::::::顶888888888 88
-888...8888888888::88::::8:::::顶:::8oo8::::::88888888888888 8
-88...88888888888:::8:::::::::顶:::::::::::::88888888888888888
-.8..8888888888888:::::::::::顶::"8888888":::顶88888888888888888
-..8888888888::888::::::::::顶:::::"8a8"::::顶88888888888888888888
-.888888888:::::88:::::::::顶88::::::::::::顶88888888888888888888888
-8888888888:::::8:::::::::顶88888::::::::顶888888888888888888888888888
-888888888:::::8:::::::::顶8888888ooooo顶8888888888888888888888888888888
-888888.顶::::::::::::::顶8888888888::::::顶8888888888888888 ''''888888888
-8888..顶:::::::::::::::顶88888888888::::::顶8888888888888888 88888888
-.888..顶::::::::::::::顶8888888888888:::::::顶888888888888888 888888
-..888.顶:::::::::::::顶88888888888888888::::::顶8888888888888 88888
-...88.顶:::::::::::::8888:88888888888888888:::::顶顶888888888 8888
-...88.顶:::::::::::8888顶::88888::888888888888:::::顶顶88888 888
-...8...顶::::::::::8888顶:::8888:::::88888888888::::::顶顶88 888
-.......8顶:::::::8888顶:::::888:::::::88:::8888888:::::::顶顶 88
-......88顶:::::::8888顶::::::88:::::::::8:::::888888::::::::顶顶 88
-.....8888顶:::::888顶:::::::::88::::::::::顶::::8888::::::::::::顶 8
-....88888:顶::::888顶::::::::::8:::::::::::顶::::888::::::::::::::顶
-...88.888:顶:::888:顶::::::::::8::::::::::::顶::888::::::::::::::::顶
-...8.88888顶:::88::顶::::::::::::::::::::::::顶:88::::::::::::::::::顶
-.....88888顶:::88::顶:::::::::::::::::::::::::顶88:::::::::::::::::::顶
-.....88888顶:::88::顶:::::::::::::::::::::::::顶:8::::::::::::::::::::顶
-....888888顶::::8::顶::::::::::::::8888::::::::顶8::::::::::::8888:::::顶
-....88888..顶:::8::顶顶:::::::::::888888:::::::顶::::::::::::888888::::顶
-....8888...顶顶:::::顶顶::::::::::888888:::::::顶顶::::::::::888888::::顶
-....8888....顶:::::::顶顶::::::::::8888:::::::顶顶顶::::::::::8888::::顶''''
-.....888....顶顶::::::顶顶顶:::::::::::::::::顶顶::顶::::::::::::::::顶''''
-......88.....顶::::::::顶顶顶顶:::::::::::顶顶顶:::顶顶:::::::::::::顶''''
-.......88....顶顶:::::::::顶顶顶顶顶顶顶顶顶顶:::::::顶顶顶顶顶顶顶顶''''
-........88....顶顶::::::::::::顶顶顶顶顶顶顶::::::::::::顶顶顶顶顶o''''
-.........88...8顶顶::::::::::::::::::::::::::::::::::::::::顶
-..........8...88顶顶::::::::::::::::::::::顶:::顶::::::::::顶
-..............888顶顶::::::::::::::::::顶顶::::::顶顶::::::顶
-.............88888顶顶:::::::::::::::顶顶顶:::::::顶顶:::::顶
-.............888888顶顶:::::::::::::顶顶顶:::::::::顶顶:::顶
-............88888888顶顶:::::::::::顶顶顶:::::::::::顶:::顶
-...........88.8888888.顶::::::::顶顶顶::::::::::::::顶::顶
-...........8..888888..顶::::::顶顶:::::::::::::::::顶::顶
-..............888888..顶:::::顶:::::::::::::::::::顶::顶顶
-.............888888...顶::::顶::::::::::::::::::::::::顶顶
-.............888888...顶::::顶::::::::::::::::::::::::顶:顶
-.............88888...顶::::::::::::::8::::::::::::::::顶::顶
-............88888...顶:::::::::::::::88::::::::::::::::顶::顶
-...........88888...顶::::::::::::::::8::::::::::::::::::顶::顶
-..........88888...顶:::::顶:::::::::::::::::::::顶::::::::顶::顶
-..........8888...顶:::::顶:::::::::::::::::::::::顶顶::::::顶::顶
-.........8888...顶:::::顶:::::::::::::::::::::::顶顶顶:::::::顶:顶
-........888....顶:::::顶顶::::::::::::::::::::::顶顶顶::::::::顶:顶
-......8888....顶::::::顶顶:::::::::::::::::::::顶顶顶::::::::: 顶:顶
-.....888......顶:::::顶:::::::::::::::::::::::顶顶::::::::::::::顶:顶
-..8888.......顶::::::::::::::::::::::::::::::顶::::::::::::::::::顶:顶
-.............顶::::::::::::::::::::::::::::::::::::::::::::::::::顶:顶
-............顶::::::::顶:::::::::::::::::::::::::::::::::::::::::顶:顶
-............顶::::::::顶:::::::::::::::::顶::::::::::::::::::::::顶:顶
-...........顶::::::::::顶::::::::::::::顶::::::::::::::::::::::::顶:顶
-...........顶:::::::::::顶8::::::::8:顶:::::::::::::::::::::::::顶:顶p
-...........顶::::::::::::888hole888顶:::::::::::::::::::::::::::顶:顶o
-...........顶:::::::::::::88888888顶:::::::::::::::::::::::::::顶:顶p
-...........顶::::::::::::::888888顶::::::::::::::::::::::::::::顶:顶
-...........顶:::::::::::::::88888顶:::::::::::::::::::::::::::顶:顶
-...........顶:::::::::::::::::88顶::::::::::::::::::::::::::::顶顶
-...........顶:::::::::::::::::::顶:::::::::::::::::::::::::::顶顶
-...........顶:::::::::::::::::::顶::::::::::::::::::::::::::顶顶
-............顶:::::::::::::::::顶::::::::::::::::::::::::::顶顶
-............顶:::::::::::::::::顶::::::::::::::::::::::::::顶
-.............顶:::::::::::::::顶::::::::::::::::::::::::::顶
-.............顶:::::::::::::::顶:::::::::::::::::::::::::顶
-..............顶:::::::::::::顶:::::::::::::::::::::::::顶
-..............顶:::::::::::::顶:::::::::::::::::::::::顶
-...............顶:::::::::::顶:::::::::::::::::::::::顶
-...............顶:::::::::::顶::::::::::::::::::::::顶
-................顶:::::::::顶::::::::::::::::::::::顶
-................顶:::::::::顶:::::::::::::::::::::顶
-.................顶:::::::顶:::::::::::::::::::::顶
-..................顶::::::顶::::::::::::::::::::顶
-..................顶:::::顶::::::::::::::::::::顶
-...................顶:::顶::::::::::::::::::::顶
-...................顶::顶::::::::::::::::::::顶
-....................顶:顶:::::::::::::::::::顶
-....................顶顶:::::::::::::::::::顶
-....................顶顶::::::::::::::::::顶
-....................顶顶:::::::::::::::::顶
-....................顶顶:::::顶::::::::顶顶
-....................顶顶::::顶顶:::::::顶顶
-....................顶顶::::::顶顶:::::顶顶
-.....................顶顶::::::::::::::顶顶
-.....................顶顶::::顶:::::::::顶顶
-......................顶顶::顶顶顶:::::::顶顶
-......................顶顶::顶顶顶:::::::顶顶
-......................顶顶:::顶顶::::::::::顶
-.......................顶顶::顶顶::::::::::顶
-.......................顶顶::顶顶:::::::::::顶
-.......................顶顶:::顶::::::::::::顶
-.......................顶顶:::::::::::::::::顶
-.......................顶顶:::::::::::::::::顶
-.......................顶顶::::::::::::::::::顶
-.......................顶顶::::::::::::::::::顶
-.......................顶顶::::::::::::::::::顶
-........................顶顶:::::::::::::::::顶
-........................顶顶:::::::::::::::::顶
-........................顶顶:::::::::::::::::顶
-........................顶顶:::::::::::::::::顶
-........................顶顶:::::::::::::::::顶
-.........................顶顶:::::::::::::::顶
-.........................顶顶:::::::::::::::顶
-.........................顶顶:::::::::::::::顶
-.........................顶顶::::::::::::::顶
-..........................顶顶:::::::::::::顶
-..........................顶顶:::::::::::::顶
-..........................顶顶:::::::::::::顶
-..........................顶顶::::::::::::顶
-..........................顶顶::::::::::::顶
-...........................顶顶:::::::::::顶
-...........................顶顶::::::::::顶
-...........................顶顶::::::::::顶
-............................顶顶::::::::顶
-............................顶顶::::::::顶
-............................顶顶::::::::顶
-.............................顶顶:::::::顶
-.............................顶顶:::::::顶
-..............................顶顶::::::顶
-..............................顶顶::::::顶
-..............................顶顶::::::顶
-..............................顶顶::::::顶
-..............................顶顶::::::顶
-..............................顶顶::::::顶
-.............................顶顶:::::::顶
-............................顶:顶::::::::顶
-............................顶:顶:::::::::顶
-............................顶:顶::::::::::顶
-............................顶:顶:::::::::::顶
-............................顶:顶::::::::::::顶
-............................顶:顶:::::::::::::顶
-............................顶:顶::::::::::::::顶
-............................顶顶:::::::::::::::::顶
-..............................顶顶::::::::::::::::顶
-................................顶顶顶:::::::::顶顶
-..................................顶顶::顶::::顶顶
-...................................顶顶顶顶顶顶顶
-......................................顶顶顶顶顶

src/main/resources/mapper/www/JySceneAuthMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.openApi.mapper.www.IJySceneAuthMapper">
+
+</mapper>

src/main/resources/mapper/www/JySceneUserAuthMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.openApi.mapper.www.IJySceneUserAuthMapper">
+
+</mapper>

src/main/resources/mapper/www/JyUserMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.openApi.mapper.www.IJyUserMapper">
+
+</mapper>