v2.2.0版本需求修改

src/main/java/com/fdkankan/ucenter/controller/api/LaserController.java

@@ -64,14 +64,11 @@ public class LaserController extends BaseController {
             return Result.success(map);
         }
         List<CameraAppVo> camera = new ArrayList<>();
-        for (Long userId : userIds) {
-
-        }
         if(sceneSource.contains(",")){
             String[] split = sceneSource.split(",");
             for (String resource : split) {
                 if("4".equals(resource)){
-                    camera.addAll( cameraDetailService.getListByUserAndType(userIds, 10));
+                    camera.addAll( cameraDetailService.getListByUserIdsAndType(userIds, 10));
                 }
                 if("5".equals(resource)){
                     camera.addAll(cameraDetailService.getListByUserIdsAndType(userIds, 11));

src/main/java/com/fdkankan/ucenter/controller/app/AppController.java

@@ -165,13 +165,13 @@ public class AppController extends BaseController {
                 return Result.failure(CameraConstant.FAILURE_CODE_6003, CameraConstant.FAILURE_MSG_6003);
             }
             CameraDetail detailEntity = cameraDetailService.getByCameraId(camera.getId());
-            Set<Long> roleIds = userRoleService.getByUser(user);
+           // Set<Long> roleIds = userRoleService.getByUser(user);
             if(ObjectUtils.isEmpty(detailEntity) || ObjectUtils.isEmpty( detailEntity.getCompanyId()) || !detailEntity.getCompanyId().equals(user.getCompanyId())){
                 return Result.failure(CameraConstant.FAILURE_CODE_6003, CameraConstant.FAILURE_MSG_6003);
             }
-            if(roleIds.contains(8L) && ( detailEntity.getUserId()== null || !detailEntity.getUserId().equals(user.getId()))){
-                return Result.failure(LoginConstant.FAILURE_CODE_3037, LoginConstant.FAILURE_MSG_3037);
-            }
+//            if(roleIds.contains(8L) && ( detailEntity.getUserId()== null || !detailEntity.getUserId().equals(user.getId()))){
+//                return Result.failure(LoginConstant.FAILURE_CODE_3037, LoginConstant.FAILURE_MSG_3037);
+//            }
         }
         if(!redisUtil.hasKey(RedisKeyUtil.PREFIX_CACHE_CAMERA + username)){
             return Result.failure(LoginConstant.FAILURE_CODE_3004,LoginConstant.FAILURE_MSG_3004);

src/main/java/com/fdkankan/ucenter/service/impl/AppCameraService.java

@@ -54,12 +54,13 @@ public class AppCameraService {
         }
         List<CameraAppVo> cameraAppVoList = new ArrayList<>();
 
-        Set<Long> roleIds = userRoleService.getByUser(user);
-        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
-            cameraAppVoList = cameraDetailService.getListByUserAndType(user.getId(),user.getCompanyId(), cameraType);
-        }else {
-            cameraAppVoList = cameraDetailService.getListByUserAndType(null,user.getCompanyId(), cameraType);
-        }
+       // Set<Long> roleIds = userRoleService.getByUser(user);
+//        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
+//            cameraAppVoList = cameraDetailService.getListByUserAndType(user.getId(),user.getCompanyId(), cameraType);
+//        }else {
+//            cameraAppVoList = cameraDetailService.getListByUserAndType(null,user.getCompanyId(), cameraType);
+//        }
+        cameraAppVoList = cameraDetailService.getListByUserAndType(null,user.getCompanyId(), cameraType);
         for (CameraAppVo cameraApp : cameraAppVoList) {
             UserIncrement userIncrementEntity = userIncrementService.getByCameraId(cameraApp.getId());
             if(userIncrementEntity != null){

src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -89,9 +89,9 @@ public class AppSceneService {
                 param.setCooperationNumList(cooperationNumList );
             }
             Set<Long> roleIds = userRoleService.getByUser(user);
-            if(!roleIds.contains(5L) && !roleIds.contains(6L)){
-                param.setUserId(user.getId());
-            }
+//            if(!roleIds.contains(5L) && !roleIds.contains(6L)){
+//                param.setUserId(user.getId());
+//            }
             if(!roleIds.contains(5L) ){
                 param.setCompanyId(user.getCompanyId());
             }

src/main/java/com/fdkankan/ucenter/service/impl/AppUserService.java

@@ -42,13 +42,14 @@ public class AppUserService {
         }
         UserVo userVo = new UserVo();
         BeanUtils.copyProperties(user,userVo);
-        Set<Long> roleIds = userRoleService.getByUser(user);
+        //Set<Long> roleIds = userRoleService.getByUser(user);
         Long cameraCount = 0L;
-        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
-            cameraCount = cameraDetailService.getCountByUserId(user.getCompanyId(),user.getId(),cameraType);
-        }else {
-            cameraCount = cameraDetailService.getCountByCompanyId(user.getCompanyId(),cameraType);
-        }
+//        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
+//            cameraCount = cameraDetailService.getCountByUserId(user.getCompanyId(),user.getId(),cameraType);
+//        }else {
+//            cameraCount = cameraDetailService.getCountByCompanyId(user.getCompanyId(),cameraType);
+//        }
+        cameraCount = cameraDetailService.getCountByCompanyId(user.getCompanyId(),cameraType);
 
         Long proCount = sceneProService.getCountByUserId(user.getId(), cameraType);
         Long plusCount = scenePlusService.getCountByUserId(user.getId(), cameraType);

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -170,12 +170,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             }
         }
 
-        User user = userService.getByUserName(param.getUserName());
+       // User user = userService.getByUserName(param.getUserName());
         Long userId = null;
-        Set<Long> roleIds = userRoleService.getByUser(user);
-        if(!roleIds.contains(6L) &&  !roleIds.contains(5L)){
-            userId = user.getId();
-        }
+//        Set<Long> roleIds = userRoleService.getByUser(user);
+//        if(!roleIds.contains(6L) &&  !roleIds.contains(5L)){
+//            userId = user.getId();
+//        }
         Page<CameraVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<Long> cameraIdList = page.getRecords().parallelStream().map(CameraVo::getId).collect(Collectors.toList());
         HashMap<Long,GroupByCount> sceneNumMap = new HashMap<>();      //场景数量,最后拍摄时间

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

@@ -140,13 +140,14 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         User user = this.getByUserName(userName);
         UserVo userVo = new UserVo();
         BeanUtils.copyProperties(user,userVo);
-        Set<Long> roleIds = userRoleService.getByUser(user);
+        //Set<Long> roleIds = userRoleService.getByUser(user);
         Long cameraCount = 0L;
-        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
-            cameraCount = cameraDetailService.getCountByUserId(user.getCompanyId(),user.getId(),null);
-        }else {
-            cameraCount = cameraDetailService.getCountByCompanyId(user.getCompanyId(),null);
-        }
+//        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
+//            cameraCount = cameraDetailService.getCountByUserId(user.getCompanyId(),user.getId(),null);
+//        }else {
+//            cameraCount = cameraDetailService.getCountByCompanyId(user.getCompanyId(),null);
+//        }
+        cameraCount = cameraDetailService.getCountByCompanyId(user.getCompanyId(),null);
         Long incrementNum = userIncrementService.getCountByUserId(user.getId(),0);
         Long incrementBindNum = userIncrementService.getCountByUserId(user.getId(),1);
         userVo.setCameraCount(cameraCount);