v1.2.0修改

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

@@ -65,7 +65,7 @@ public enum ResultCode  {
     INCREMENT_TYPE_ERROR(50048, "权益类型错误！"),
     DEL_UCENTER_ERROR(50049, "该用户已绑定相机，请先解绑再删除用户。"),
 
-    JY_ID_NO_EXIST(60001, "警员ID不存在"),
+    JY_ID_NO_EXIST(60001, "警员不存在"),
     AES_ENCRYPT_ERROR(60002, "aes加密失败"),
     AES_DESENCRYPT_ERROR(60003, "aes解密失败"),
     DEL_AUTH_ERROR(60004, "无授权，无需删除"),

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

@@ -31,6 +31,10 @@ public class InnerAPIController extends BaseController {
     public ResultData getByRyId(@RequestBody UserParam param){
         return ResultData.ok(jyUserService.getByRyId(param.getRyId()));
     }
+    @PostMapping("/getByRyNo")
+    public ResultData getByRyNo(@RequestBody UserParam param){
+        return ResultData.ok(jyUserService.getByRyNo(param.getRyId()));
+    }
 
     @PostMapping("/updateStatus")
     public ResultData updateStatus(@RequestBody UserParam userParam){
@@ -67,10 +71,16 @@ public class InnerAPIController extends BaseController {
 
     @PostMapping("/delAuth")
     public ResultData delAuth(@RequestBody JySceneUserAuth param){
-        if(StringUtils.isBlank(param.getNum()) || StringUtils.isBlank(param.getRyId())){
+        if(StringUtils.isBlank(param.getNum()) || (StringUtils.isBlank(param.getRyId()) && StringUtils.isBlank(param.getRyNo()))){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        JySceneUserAuth db = jySceneUserAuthService.getByNumAndRyId(param.getNum(),param.getRyId());
+        JySceneUserAuth db = null;
+        if(StringUtils.isNotBlank(param.getRyId())){
+            db = jySceneUserAuthService.getByNumAndRyId(param.getNum(),param.getRyId());
+        }
+        if(StringUtils.isNotBlank(param.getRyNo())){
+            db = jySceneUserAuthService.getByNumAndRyNo(param.getNum(),param.getRyNo());
+        }
         if(db == null){
             throw new BusinessException(ResultCode.DEL_AUTH_ERROR);
         }
@@ -98,7 +108,7 @@ public class InnerAPIController extends BaseController {
 
     @PostMapping("/getAuthList")
     public ResultData getAuthList(@RequestBody SceneParam param){
-        if(StringUtils.isBlank(param.getRyId())){
+        if(StringUtils.isBlank(param.getRyId()) && StringUtils.isBlank(param.getRyNo())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         return ResultData.ok(jySceneUserAuthService.getAuthList(param));

src/main/java/com/fdkankan/manage/entity/JySceneUserAuth.java

@@ -104,6 +104,9 @@ public class JySceneUserAuth implements Serializable {
     private String ryId;
 
     @TableField(exist = false)
+    private String ryNo;
+
+    @TableField(exist = false)
     private String ryNickName;
 
     @TableField(exist = false)

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

@@ -28,6 +28,7 @@ public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
     void delAuth(JySceneUserAuth param);
 
     JySceneUserAuth getByNumAndRyId(String num, String ryId);
+    JySceneUserAuth getByNumAndRyNo(String num, String ryNo);
 
     JySceneUserAuth getByNumAndJyUserId(Integer jyUserId, String num);
 

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

@@ -22,7 +22,6 @@ public interface IJyUserService extends IService<JyUser> {
     List<JyUser> getListByRyId(String ryId);
 
     JyUser getByRyId(String ryId);
-
     HashMap<Long, JyUser> getMapByUserIds(Set<Long> userIds);
 
     JyUser getBySysId(Object loginId);

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

@@ -92,7 +92,12 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
             SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
             sysRoleId = byId.getRoleId();
         }else {
-            loginUser = jyUserService.getByRyId(param.getRyId());
+            if(StringUtils.isNotBlank(param.getRyId())){
+                loginUser = jyUserService.getByRyId(param.getRyId());
+            }
+            if(StringUtils.isNotBlank(param.getRyNo())){
+                loginUser = jyUserService.getByRyNo(param.getRyNo());
+            }
         }
         if(loginUser == null){
             throw new BusinessException(ResultCode.USER_NOT_EXIST);
@@ -120,6 +125,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
             if(jyUser != null){
                 jySceneUserAuth.setRyId(jyUser.getRyId());
                 jySceneUserAuth.setRyNickName(jyUser.getRyNickName());
+                jySceneUserAuth.setRyNo(jyUser.getRyNo());
             }
 
         }
@@ -166,10 +172,13 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
             throw new BusinessException(ResultCode.SCENE_NOT_EXITS);
         }
 
-        if(StringUtils.isBlank(param.getRyId()) ){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        JyUser jyUser = null;
+        if(StringUtils.isNotBlank(param.getRyId()) ){
+            jyUser = jyUserService.getByRyId(param.getRyId());
+        }
+        if(StringUtils.isNotBlank(param.getRyNo()) ){
+            jyUser = jyUserService.getByRyNo(param.getRyNo());
         }
-        JyUser jyUser = jyUserService.getByRyId(param.getRyId());
         if(jyUser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
@@ -241,6 +250,15 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
     }
 
     @Override
+    public JySceneUserAuth getByNumAndRyNo(String num, String ryNo) {
+        JyUser jyUser = jyUserService.getByRyNo(ryNo);
+        if(jyUser == null){
+            throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
+        }
+        return this.getByNumAndJyUserId(jyUser.getId(),num);
+    }
+
+    @Override
     public Object checkAuthOther(JySceneUserAuth param) {
         if(StringUtils.isBlank(param.getNum())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -263,10 +263,21 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public void updateStatus(UserParam userParam) {
-        if(StringUtils.isBlank(userParam.getRyId()) || userParam.getStatus() == null){
+        if((StringUtils.isNotBlank(userParam.getRyNo()) &&  StringUtils.isBlank(userParam.getRyNo())) || userParam.getStatus() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        JyUser jyuser = jyUserService.getByRyId(userParam.getRyId());
+        JyUser jyuser = null;
+        if(StringUtils.isNotBlank(userParam.getRyId())){
+            jyuser = jyUserService.getByRyId(userParam.getRyId());
+        }
+        if(StringUtils.isNotBlank(userParam.getRyNo())){
+            jyuser = jyUserService.getByRyNo(userParam.getRyNo());
+        }
+        if(StringUtils.isNotBlank(userParam.getRyId()) && StringUtils.isNotBlank(userParam.getRyNo())){
+            if(! (jyuser.getRyId().equals(userParam.getRyId()) && jyuser.getRyNo().equals(userParam.getRyNo()))){
+                throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
+            }
+        }
         if(jyuser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }

src/main/java/com/fdkankan/manage/vo/request/SceneParam.java

@@ -20,4 +20,5 @@ public class SceneParam extends RequestBase {
     private List<String> authNumList = new ArrayList<>();
 
     private String ryId;
+    private String ryNo;
 }