1

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

@@ -422,10 +422,10 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                     if("GB".equals(detailEntity.getUnit())){
                         Long proSpace = sceneProService.getSpaceSumByCameraId(cameraEntity.getId());
                         Long plusSpace = scenePlusService.getSpaceSumByCameraId(cameraEntity.getId());
-
-                        vo.setUsedSpace(Double.valueOf(FileSizeUtil.formetFileSize(proSpace + plusSpace, FileSizeUtil.SIZETYPE_GB)).intValue() +"" );
+                        Long space = (plusSpace == null ?0L:plusSpace) + (proSpace == null ?0L:proSpace);
+                        vo.setUsedSpace(Double.valueOf(FileSizeUtil.formetFileSize(space, FileSizeUtil.SIZETYPE_GB)).intValue() +"" );
                         vo.setTotalSpace(Double.valueOf(FileSizeUtil.formetFileSize(detailEntity.getTotalSpace().longValue(), FileSizeUtil.SIZETYPE_GB)).intValue() +"");
-                        vo.setUsedSpaceStr(FileSizeUtil.formatFileSize(proSpace + plusSpace));
+                        vo.setUsedSpaceStr(FileSizeUtil.formatFileSize(space));
                         vo.setTotalSpaceStr(FileSizeUtil.formatFileSize(detailEntity.getTotalSpace().longValue()));
                     }
                     if("SP".equals(detailEntity.getUnit())){