1

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

@@ -185,8 +185,10 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         for (CameraVo responseCamera : page.getRecords()) {
             responseCamera.setCameraType(param.getCameraType());
             GroupByCount groupByCount = sceneNumMap.get(responseCamera.getId());
-            Integer sceneNum = groupByCount == null ? 0 : Math.toIntExact(sceneNumMap.get(responseCamera.getId()).getCount());
-            Long space = groupByCount == null ?0 :sceneNumMap.get(responseCamera.getId()).getSpace();
+
+            Integer sceneNum = (groupByCount == null || groupByCount.getCount() == null) ? 0 : Math.toIntExact(groupByCount.getCount());
+            Long space = (groupByCount == null || groupByCount.getSpace() == null) ? 0 : groupByCount.getSpace();
+
             if (responseCamera.getType() != 0){
                 if("GB".equals(responseCamera.getUnit())){
                     responseCamera.setUsedSpaceStr(FileSizeUtil.formatFileSize(space));

src/main/java/com/fdkankan/ucenter/vo/response/GroupByCount.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class GroupByCount {
     private Long id;
-    private Long count;
+    private Long count = 0L;
     private String lastTime;
-    private Long space;
+    private Long space = 0L;
 }