重新统计相机容量

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

@@ -40,5 +40,5 @@ public interface ICameraService extends IService<Camera> {
 
     Integer updateCompany(List<CameraInOutParam> companyParams);
 
-    void initAllCameraSpace();
+    void initAllCameraSpace(Long userId);
 }

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

@@ -477,10 +477,20 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
 
     @Override
-    public void initAllCameraSpace() {
-        List<Camera> list = this.list();
-        List<Long> cameraIds = list.stream().map(Camera::getId).collect(Collectors.toList());
-        List<CameraDetail> cameraDetails = cameraDetailService.getByCameraIds(cameraIds);
+    public void initAllCameraSpace(Long userId) {
+        List<Long> cameraIds ;
+        List<CameraDetail> cameraDetails;
+        if(userId != null){
+            cameraDetails = cameraDetailService.getByUserId(userId);
+        }else {
+            List<Camera> list = this.list();
+            cameraIds = list.stream().map(Camera::getId).collect(Collectors.toList());
+            cameraDetails = cameraDetailService.getByCameraIds(cameraIds);
+        }
+        if(cameraDetails == null || cameraDetails.size() <=0){
+            return;
+        }
+
         HashMap<Long, Long> map = sceneProService.getSpaceGroupByCameraId();
         for (CameraDetail cameraDetail : cameraDetails) {
             Long space = map.get(cameraDetail.getCameraId());

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

@@ -719,11 +719,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<GroupByCount> proSum = this.getBaseMapper().getProSpaceGroupByCameraId();
         HashMap<Long,Long > map = new HashMap<>();
         for (GroupByCount groupByCount : proSum) {
-            map.merge(groupByCount.getId(), groupByCount.getCount(), Long::sum);
+            map.merge(groupByCount.getId(), groupByCount.getCount()==null?0:groupByCount.getCount(), Long::sum);
         }
         List<GroupByCount > plusSum = this.getBaseMapper().getPlusSpaceGroupByCameraId();
         for (GroupByCount groupByCount : plusSum) {
-            map.merge(groupByCount.getId(), groupByCount.getCount(), Long::sum);
+            map.merge(groupByCount.getId(), groupByCount.getCount()==null?0:groupByCount.getCount(), Long::sum);
         }
         return map;
     }

src/main/java/com/fdkankan/manage/test/TestController.java

@@ -49,8 +49,8 @@ public class TestController {
     }
 
     @RequestMapping("/testCameraSpace")
-    public ResultData test(){
-        cameraService.initAllCameraSpace();
+    public ResultData testCameraSpace(@RequestParam(required = false) Long userId){
+        cameraService.initAllCameraSpace(userId);
         return ResultData.ok();
     }
 

src/main/resources/bootstrap-dev.yml

@@ -32,7 +32,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-rabbitmq-config.yaml
+          - data-id: common-rabbitmq-config.yamla
             group: DEFAULT_GROUP
             refresh: true