更新接口

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -72,6 +72,7 @@ public enum ResultCode  {
     AUTH_ERROR(60005, "场景管理者无需授权"),
     SCENE_NOT_EXITS(60006, "授权失败，场景不存在或已删除"),
     SCENE_AUTH_EXITS(60007, "该用户已被授权， 请删除其授权后重试"),
+    RYNO_EXITS(60008, "人员编号重复，请联系管理员"),
 
 
     ;

src/main/java/com/fdkankan/manage/controller/inner/InnerAPIController.java

@@ -89,6 +89,12 @@ public class InnerAPIController extends BaseController {
         return ResultData.ok( jySceneUserAuthService.checkNumAuth(num,getToken()));
     }
 
+    @PostMapping("/getAuthType")
+    public ResultData getAuthType(@RequestBody SceneParam param){
+
+        return ResultData.ok(jySceneUserAuthService.getAuthType(param));
+    }
+
     @PostMapping("/getAuthList")
     public ResultData getAuthList(@RequestBody SceneParam param){
 

src/main/java/com/fdkankan/manage/service/IJySceneUserAuthService.java

@@ -38,4 +38,5 @@ public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
     Object checkNumAuth(String num,String token);
 
 
+    void delByJyUserId(Integer id);
 }

src/main/java/com/fdkankan/manage/service/IJyUserService.java

@@ -28,4 +28,6 @@ public interface IJyUserService extends IService<JyUser> {
     JyUser getBySysId(Object loginId);
 
     JyUser getByUserId(Long sceneUserId);
+
+    JyUser getByRyNo(String ryNo);
 }

src/main/java/com/fdkankan/manage/service/impl/JySceneUserAuthServiceImpl.java

@@ -321,4 +321,11 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         wrapper.eq(JySceneUserAuth::getJyUserId,jyUserId);
         return this.list(wrapper);
     }
+
+    @Override
+    public void delByJyUserId(Integer jyUserId) {
+        LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JySceneUserAuth::getJyUserId,jyUserId);
+        this.removeById(jyUserId);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/JyUserServiceImpl.java

@@ -80,4 +80,11 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
         wrapper.eq(JyUser::getUserId,sceneUserId);
         return this.getOne(wrapper);
     }
+
+    @Override
+    public JyUser getByRyNo(String ryNo) {
+        LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyUser::getRyNo,ryNo);
+        return this.getOne(wrapper);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -60,6 +60,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     private String host;
     @Autowired
     private IJyUserService jyUserService;
+    @Autowired
+    private IJySceneUserAuthService jySceneUserAuthService;
 
     @Override
     public PageInfo pageList(UserParam param) {
@@ -158,13 +160,18 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             || StringUtils.isBlank(param.getRyId()) || StringUtils.isBlank(param.getRyNo())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        String password = AesUtil.desEncrypt(param.getPassword());
+        String  password = AesUtil.desEncrypt(param.getPassword());
 
         String passwordMd5 = SecurityUtil.MD5(password);
         String passwordMd52 = SecurityUtil.MD52(password);
 
         JyUser jyUser = jyUserService.getByRyId(param.getRyId());
 
+        JyUser jyUser2 = jyUserService.getByRyNo(param.getRyNo());
+        if(jyUser2 !=null){
+            throw new BusinessException(ResultCode.RYNO_EXITS);
+        }
+
         if(jyUser == null){
             jyUser = new JyUser();
         }
@@ -234,7 +241,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         this.removeById(jyuser.getUserId());
         jyUserService.removeById(jyuser.getId());
         sysUserService.removeById(jyuser.getSysUserId());
-
+        jySceneUserAuthService.delByJyUserId(jyuser.getId());
     }
 
     @Override
@@ -247,15 +254,14 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
 
-        if(userParam.getStatus() == 1){
+        if(userParam.getStatus() == 0){
             //将相机和场景归属超管
             cameraDetailService.giveSuperAdmin(jyuser.getUserId());
-            LambdaUpdateWrapper<SysUser> wrapper = new LambdaUpdateWrapper<>();
-            wrapper.eq(SysUser::getId,jyuser.getSysUserId());
-            wrapper.set(SysUser::getStatus,1);
-            sysUserService.update(wrapper);
         }
-
+        LambdaUpdateWrapper<SysUser> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(SysUser::getId,jyuser.getSysUserId());
+        wrapper.set(SysUser::getStatus,userParam.getStatus());
+        sysUserService.update(wrapper);
 
     }
 }