深时合并数据集

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -95,4 +95,6 @@ public interface ISceneProService extends IService<ScenePro> {
     Integer getSceneSourceByNum(String sceneNum);
 
     List<ScenePro> getListByUserId(Long id,Long cameraId);
+
+    Long getCameraIdByNum(String sceneCode);
 }

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

@@ -159,11 +159,22 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
 
     @Override
     public PageInfo pageList(CameraParam param) {
-        User user = userService.getByUserName(param.getUserName());
-        Set<Long> roleIds = userRoleService.getByUser(user);
-        if(roleIds.contains(6L) || !roleIds.contains(5L)){
-            param.setCompanyId(user.getCompanyId());
+
+        if(StringUtils.isNotBlank(param.getSceneCode())){
+            Long cameraId = sceneProService.getCameraIdByNum(param.getSceneCode());
+            if(cameraId != null){
+                CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
+                if(cameraDetail != null && cameraDetail.getCompanyId() != null){
+                    param.setCompanyId(cameraDetail.getCompanyId());
+                }
+            }
         }
+
+        User user = userService.getByUserName(param.getUserName());
+//        Set<Long> roleIds = userRoleService.getByUser(user);
+//        if(roleIds.contains(6L) || !roleIds.contains(5L)){
+//            param.setCompanyId(user.getCompanyId());
+//        }
         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/SceneProServiceImpl.java

@@ -1327,4 +1327,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         return vo;
     }
+
+    @Override
+    public Long getCameraIdByNum(String sceneCode) {
+        Long cameraId = null;
+        ScenePro pro = this.getByNum(sceneCode);
+        if(pro == null){
+            ScenePlus plus = scenePlusService.getByNum(sceneCode);
+            if(plus!=null){
+                cameraId = plus.getCameraId();
+            }
+        }else {
+            cameraId = pro.getCameraId();
+        }
+        return cameraId;
+    }
 }

src/main/java/com/fdkankan/ucenter/vo/request/CameraParam.java

@@ -11,5 +11,7 @@ public class CameraParam extends RequestBase {
     private String userName;
     private Long userId;
 
+
+    private String sceneCode;
     private Long companyId;
 }