Merge branch 'test'

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

@@ -236,11 +236,28 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<GroupByCount> result2 = this.getBaseMapper().findScenePlusNumByCameraIds(cameraIdList);
         result.forEach(entity ->map.put(entity.getId(),entity));
         for (GroupByCount groupByCount : result2) {
-            if (map.get(groupByCount.getId()) != null) {
-                Long totalCount = map.get(groupByCount.getId()).getCount() + groupByCount.getCount();
-                String lastTime = DateUserUtil.getLastTime(map.get(groupByCount.getId()).getLastTime(), groupByCount.getLastTime());
+            GroupByCount groupByCount1 = map.get(groupByCount.getId());
+
+            if (groupByCount1 != null) {
+                if(groupByCount1.getCount() == null){
+                    groupByCount1.setCount(0L);
+                }
+                if(groupByCount.getCount() == null){
+                    groupByCount.setCount(0L);
+                }
+                if(groupByCount1.getSpace() == null){
+                    groupByCount1.setSpace(0L);
+                }
+                if(groupByCount.getSpace() == null){
+                    groupByCount.setSpace(0L);
+                }
+                Long totalCount = groupByCount1.getCount()  + groupByCount.getCount();
+                String lastTime = DateUserUtil.getLastTime(groupByCount1.getLastTime(), groupByCount.getLastTime());
                 groupByCount.setCount(totalCount);
                 groupByCount.setLastTime(lastTime);
+
+                Long totalSpace = groupByCount1.getSpace() + groupByCount.getSpace();
+                groupByCount.setSpace(totalSpace);
             }
             map.put(groupByCount.getId(),groupByCount);
         }