1

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

@@ -420,9 +420,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                 vo.setUnit(detailEntity.getUnit());
                 if (detailEntity.getType() != 0){
                     if("GB".equals(detailEntity.getUnit())){
-                        vo.setUsedSpace(Double.valueOf(FileSizeUtil.formetFileSize(detailEntity.getUsedSpace().longValue(), FileSizeUtil.SIZETYPE_GB)).intValue() +"" );
+                        Long proSpace = sceneProService.getSpaceSumByCameraId(cameraEntity.getId());
+                        Long plusSpace = scenePlusService.getSpaceSumByCameraId(cameraEntity.getId());
+
+                        vo.setUsedSpace(Double.valueOf(FileSizeUtil.formetFileSize(proSpace + plusSpace, FileSizeUtil.SIZETYPE_GB)).intValue() +"" );
                         vo.setTotalSpace(Double.valueOf(FileSizeUtil.formetFileSize(detailEntity.getTotalSpace().longValue(), FileSizeUtil.SIZETYPE_GB)).intValue() +"");
-                        vo.setUsedSpaceStr(FileSizeUtil.formatFileSize(detailEntity.getUsedSpace().longValue()));
+                        vo.setUsedSpaceStr(FileSizeUtil.formatFileSize(proSpace + plusSpace));
                         vo.setTotalSpaceStr(FileSizeUtil.formatFileSize(detailEntity.getTotalSpace().longValue()));
                     }
                     if("SP".equals(detailEntity.getUnit())){

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

@@ -74,6 +74,10 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     ICameraSpaceService cameraSpaceService;
     @Autowired
     ICameraTypeService cameraTypeService;
+    @Autowired
+    ISceneProService sceneProService;
+    @Autowired
+    IScenePlusService scenePlusService;
 
     private User getByEmail(String email){
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
@@ -319,18 +323,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
                 default:  cameraVo.setNickName("Pro设备用户");cameraVo.setNickNameEn("4DKanKan user"); break;
             }
         }
-        List<CameraSpaceVo> voList = cameraSpaceService.getVoListByCameraId(cameraVo.getId());
-        if(voList != null && voList.size() > 0){
-            CameraSpaceVo cameraSpace = voList.get(0);
-            Long space = cameraSpace.getSpace();
-            cameraVo.setSpaceId(cameraSpace.getId());
-            cameraVo.setSpace((long) FileSizeUtil.formetFileSize(space, FileSizeUtil.SIZETYPE_GB));
-            cameraVo.setSpaceStr(FileSizeUtil.formatFileSize(space));
-            cameraVo.setSpaceEndStr(DateUtil.date2String(cameraSpace.getSpaceEndTime(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
-            if(Days.daysBetween(new DateTime(), new DateTime(cameraSpace.getSpaceEndTime())).getDays() < 7){
-                cameraVo.setIsExpire(true);
-            }
-        }
+
         //获取会员权益
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraVo.getId());
         if(userIncrement != null){