1

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

@@ -85,6 +85,8 @@ public enum ResultCode  {
     TEMPLATE_EMPTY(60016, "模板数据为空"),
 
     ID_CARD_EXIT(60017, "身份证号码已存在"),
+
+    ADMIN_NOT_DISABLE(60018, "管理员无法删除或禁用"),
     ;
 
     private Integer code;

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

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.entity.CameraDetail;
+import com.fdkankan.manage.entity.JyUser;
 
 import java.util.HashMap;
 import java.util.List;
@@ -42,5 +43,5 @@ public interface ICameraDetailService extends IService<CameraDetail> {
 
     void addUsedSpace(Long cameraId, Long space);
 
-    void giveSuperAdmin(Long userId);
+    void giveSuperAdmin(JyUser jyUser);
 }

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

@@ -232,19 +232,39 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         this.updateById(cameraDetail);
     }
 
+    @Autowired
+    IJyPlatformService platformService;
+    @Autowired
+    IJyUserService jyUserService;
+
     @Override
-    public void giveSuperAdmin(Long userId) {
+    public void giveSuperAdmin(JyUser jyUser) {
+        Long userId = jyUser.getUserId();
+        String userName = jyUser.getRyNickName();
+        Long toUserId = 818L;
+
         //删除用户通知深时修改场景归属
-        laserService.updateUser(new LaserUpdateUserVo(userId,"admin",818L));
+        if(jyUser.getPlatformId() != null ){
+            JyPlatform jyPlatform = platformService.getById(jyUser.getPlatformId());
+            if(jyPlatform != null){
+                JyUser jyUser1 = jyUserService.getByIdCard(jyPlatform.getIdCard());
+                if(jyUser1 != null){
+                    userName = jyUser1.getRyNickName();
+                    toUserId = jyUser1.getUserId();
+                }
+            }
+        }
+
+        laserService.updateUser(new LaserUpdateUserVo(userId,userName,toUserId));
 
         LambdaUpdateWrapper<ScenePro> wrapper1 = new LambdaUpdateWrapper<>();
         wrapper1.eq(ScenePro::getUserId,userId);
-        wrapper1.set(ScenePro::getUserId,818L);
+        wrapper1.set(ScenePro::getUserId,toUserId);
         sceneProService.update(wrapper1);
 
         LambdaUpdateWrapper<ScenePlus> wrapper2 = new LambdaUpdateWrapper<>();
         wrapper2.eq(ScenePlus::getUserId,userId);
-        wrapper2.set(ScenePlus::getUserId,818L);
+        wrapper2.set(ScenePlus::getUserId,toUserId);
         scenePlusService.update(wrapper2);
     }
 }

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

@@ -152,10 +152,14 @@ public class JyPlatformServiceImpl extends ServiceImpl<IJyPlatformMapper, JyPlat
         if(param.getId() == null|| param.getToPlatformId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        if(param.getId() == 1){
+            throw new BusinessException(ResultCode.ADMIN_NOT_DISABLE);
+        }
         JyPlatform jyPlatform = this.getById(param.getId());
         if(jyPlatform == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+
         //update userRole
         JyUser jyUser = jyUserService.getById(param.getJyUserId());
         if(jyUser != null){

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

@@ -86,12 +86,9 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
     @Override
     public Object pageList(JyUserPlatformParam param) {
         SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
-        if(byId.getRoleId() != 1L || byId.getRoleId() !=45L){
+        if(byId.getRoleId() != 1L ){
             param.setPlatformId(getLoginPlatformId());
         }
-        if(byId.getRoleId() == 45L){
-            param.setIsJm(1);
-        }
         Page<JyUserPlatformVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<Integer> ids = page.getRecords().stream().map(JyUserPlatform::getPlatformId).collect(Collectors.toList());
         HashMap<Integer,JyPlatform> map = new HashMap<>();
@@ -103,8 +100,6 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
             JyPlatform jyPlatform = map.get(record.getPlatformId());
             if(jyPlatform != null){
                 record.setPlatformName(jyPlatform.getPlatformName());
-            }else {
-                record.setPlatformName("江门");
             }
         }
         return PageInfo.PageInfo(page);

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

@@ -307,32 +307,25 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
         JyUser jyUser = jyUserService.getBySysId(byId.getId());
-        if(byId.getRoleId() != 1L && byId.getRoleId() != 45L && byId.getRoleId() != 48L){
+        if(byId.getRoleId() != 1L ){
             if(jyUser == null){
                 throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
             }
             param.setUserId(jyUser.getUserId());
-            List<JySceneUserAuth> list = jySceneUserAuthService.getByJyUserId(jyUser.getId());
-            if(list.size() >0){
-                List<String> numList = list.stream().filter(entity -> !(entity.getLookAuth()==0 && entity.getEditAuth() ==0)).map(JySceneUserAuth::getNum).collect(Collectors.toList());
-                param.setAuthNumList(numList);
+            if(byId.getRoleId() != 45L && byId.getRoleId() != 48L){
+                List<JySceneUserAuth> list = jySceneUserAuthService.getByJyUserId(jyUser.getId());
+                if(list.size() >0){
+                    List<String> numList = list.stream().filter(entity -> !(entity.getLookAuth()==0 && entity.getEditAuth() ==0)).map(JySceneUserAuth::getNum).collect(Collectors.toList());
+                    param.setAuthNumList(numList);
+                }
             }
         }
         if(byId.getRoleId() == 45L || byId.getRoleId() == 48L){
             List<Long> userIds = new ArrayList<>();
             //获取本平台所有用户
-            if(byId.getRoleId() == 48L){
-                Integer loginPlatformId = jyUserPlatformService.getLoginPlatformId();
-                if(loginPlatformId != null) {
-                    userIds = jyUserService.getByUserIdPlatform(loginPlatformId);
-                }
-            }
-
-            if(byId.getRoleId() == 45L){
-                //获取江门平台用户
-                List<JyUser> jyUsers =  jyUserService.getListByJm();
-                userIds = jyUsers.stream().map(JyUser::getUserId).collect(Collectors.toList());
-
+            Integer loginPlatformId = jyUserPlatformService.getLoginPlatformId();
+            if(loginPlatformId != null) {
+                userIds = jyUserService.getByUserIdPlatform(loginPlatformId);
             }
             if(userIds.isEmpty()){
                 return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));

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

@@ -277,9 +277,14 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         if(jyuser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
+        SysUser sysUser = sysUserService.getById(jyuser.getSysUserId());
+
+        if(sysUser.getRoleId() == 1L || sysUser.getRoleId() == 45L || sysUser.getRoleId() == 48L){
+            throw new BusinessException(ResultCode.ADMIN_NOT_DISABLE);
+        }
 
         //将相机和场景归属超管
-        cameraDetailService.giveSuperAdmin(jyuser.getUserId());
+        cameraDetailService.giveSuperAdmin(jyuser);
 
         this.removeById(jyuser.getUserId());
         sysUserService.removeById(jyuser.getSysUserId());
@@ -307,10 +312,15 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         if(jyuser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
+        SysUser sysUser = sysUserService.getById(jyuser.getSysUserId());
+
+        if(sysUser.getRoleId() == 1L || sysUser.getRoleId() == 45L || sysUser.getRoleId() == 48L){
+            throw new BusinessException(ResultCode.ADMIN_NOT_DISABLE);
+        }
 
         if(userParam.getStatus() == 0){
             //将相机和场景归属超管
-            cameraDetailService.giveSuperAdmin(jyuser.getUserId());
+            cameraDetailService.giveSuperAdmin(jyuser);
         }
         manageService.updateLoginUserStatus(jyuser.getRyNo(),userParam.getStatus());