1111

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

@@ -13,4 +13,10 @@ public class JmgaConstant {
 
     public static final String API_GET_UCENTER_USER = "/service/manage/inner/getByRyId";
 
+    public static final String API_SET_AUTHTYPE = "/service/manage/inner/setAuthType";
+
+    public static final String API_ADD_AUTH = "/service/manage/inner/addAuth";
+
+    public static final String API_DEL_AUTH = "/service/manage/inner/delAuth";
+
 }

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

@@ -32,7 +32,7 @@ public class JySceneAuthController {
 
     @SaIgnore
     @ValidateApi
-    @PostMapping("updateAuth")
+    @PostMapping("setAuthType")
     public ResultData updateAuth(@Validated @RequestBody UpdateJySceneAuthParamVo param){
         return jySceneAuthService.updateAuth(param);
     }

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

@@ -5,8 +5,10 @@ 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.DelAuthParamVo;
 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.validation.annotation.Validated;
@@ -43,12 +45,26 @@ public class JySceneUserAuthController {
 
     @ValidateApi
     @SaIgnore
+    @PostMapping("/saveAuth")
+    public ResultData saveSceneUserAuth(@Validated @RequestBody SceneUserAuthParam param){
+        return jySceneUserAuthService.saveAuth(param);
+    }
+
+    @ValidateApi
+    @SaIgnore
     @PostMapping("/deleteSceneUserAuth")
     public ResultData deleteSceneUserAuth(@Validated @RequestBody DeleteSceneUserAuthParamVo param){
         jySceneUserAuthService.deleteSceneUserAuth(param);
         return ResultData.ok();
     }
 
+    @ValidateApi
+    @SaIgnore
+    @PostMapping("/delAuth")
+    public ResultData delAuth(@Validated @RequestBody DelAuthParamVo param){
+        return jySceneUserAuthService.delAuth(param);
+    }
+
 
 
 }

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

@@ -3,8 +3,10 @@ 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.DelAuthParamVo;
 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.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,7 +28,11 @@ public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
 
     ResultData saveSceneUserAuth(SaveSceneUserAuthParamVo param);
 
+    ResultData saveAuth(SceneUserAuthParam param);
+
     List<JySceneUserAuth> listByNumAndJyUserIds(String num, Set<Integer> jyUserIds);
 
     void deleteSceneUserAuth(DeleteSceneUserAuthParamVo param);
+
+    ResultData delAuth(DelAuthParamVo param);
 }

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

@@ -4,8 +4,10 @@ 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.constant.JmgaConstant;
 import com.fdkankan.openApi.entity.www.JySceneAuth;
 import com.fdkankan.openApi.entity.www.ScenePlus;
+import com.fdkankan.openApi.httpclient.client.FdKKClient;
 import com.fdkankan.openApi.mapper.www.IJySceneAuthMapper;
 import com.fdkankan.openApi.service.www.IJySceneAuthService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,6 +33,8 @@ public class JySceneAuthServiceImpl extends ServiceImpl<IJySceneAuthMapper, JySc
 
     @Autowired
     private IScenePlusService scenePlusService;
+    @Autowired
+    private FdKKClient fdKKClient;
 
     @Override
     public ResultData updateAuth(UpdateJySceneAuthParamVo param) {
@@ -41,14 +45,6 @@ public class JySceneAuthServiceImpl extends ServiceImpl<IJySceneAuthMapper, JySc
             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();
+        return fdKKClient.post(JmgaConstant.API_SET_AUTHTYPE, param);
     }
 }

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

@@ -10,15 +10,18 @@ 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.constant.JmgaConstant;
 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.httpclient.client.FdKKClient;
 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.DelAuthParamVo;
 import com.fdkankan.openApi.vo.www.DeleteSceneUserAuthParamVo;
 import com.fdkankan.openApi.vo.www.SaveSceneUserAuthParamVo;
 import com.fdkankan.openApi.vo.www.SceneUserAuthParam;
@@ -49,6 +52,9 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
     @Autowired
     private IScenePlusService scenePlusService;
 
+    @Autowired
+    private FdKKClient fdKKClient;
+
 
     @Override
     public ResultData pageListAuth(JmgaGetAuthParamVo param) {
@@ -117,6 +123,11 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
     }
 
     @Override
+    public ResultData saveAuth(SceneUserAuthParam param) {
+        return fdKKClient.post(JmgaConstant.API_ADD_AUTH, param);
+    }
+
+    @Override
     public List<JySceneUserAuth> listByNumAndJyUserIds(String num, Set<Integer> jyUserIds) {
         return this.list(new LambdaQueryWrapper<JySceneUserAuth>().eq(JySceneUserAuth::getNum, num).in(JySceneUserAuth::getJyUserId, jyUserIds));
     }
@@ -136,4 +147,9 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         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));
     }
+
+    @Override
+    public ResultData delAuth(DelAuthParamVo param) {
+         return fdKKClient.post(JmgaConstant.API_DEL_AUTH, param);
+    }
 }

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

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

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

@@ -11,6 +11,8 @@ import java.util.Date;
 @Data
 public class SceneUserAuthParam{
 
+    private String num;
+
     @NotBlank(message = "不能为空")
     private String ryId;