Merge branch 'task-lyh-inctype2' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/controller/app/AppCameraController.java

src/main/java/com/fdkankan/ucenter/controller/app/AppCameraController.java

@@ -25,9 +25,7 @@ public class AppCameraController {
     public Result getCamerasForUser(@RequestBody JSONObject param ){
         String userName = param.get("userName") == null ? null : param.getString("userName");
         Integer cameraType = param.get("cameraType") == null ? 4 : param.getInteger("cameraType");
-        if(cameraType == 4){
-            cameraType = 1;
-        }
+
         return Result.success(appCameraService.getCameraForUser(userName,cameraType));
     }
 
@@ -81,8 +79,9 @@ public class AppCameraController {
     }
 
     @GetMapping("/checkCameraSpace")
-    public Result checkCameraSpace(@RequestParam(required = false) String snCode){
-        log.info("checkCameraSpace-snCode:{}",snCode);
-        return Result.success( appCameraService.checkCameraSpace(snCode));
+    public Result checkCameraSpace(@RequestParam(required = false) String snCode,
+                                   @RequestParam(required = false) String unicode){
+
+        return Result.success( appCameraService.checkCameraSpace(snCode,unicode));
     }
 }

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

@@ -1,16 +1,14 @@
 package com.fdkankan.ucenter.service.impl;
 
 import com.amazonaws.services.devopsguru.model.ListInsightsOngoingStatusFilter;
+import com.amazonaws.services.simpleworkflow.flow.annotations.NoWait;
 import com.fdkankan.common.constant.AppConstant;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileSizeUtil;
 import com.fdkankan.ucenter.constant.CameraConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;
-import com.fdkankan.ucenter.entity.Camera;
-import com.fdkankan.ucenter.entity.CameraDetail;
-import com.fdkankan.ucenter.entity.User;
-import com.fdkankan.ucenter.entity.UserIncrement;
+import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.vo.response.AppCameraSpace;
 import com.fdkankan.ucenter.vo.response.CameraAppVo;
@@ -40,6 +38,8 @@ public class AppCameraService {
     @Autowired
     IScenePlusService scenePlusService;
     @Autowired
+    IScenePlusExtService scenePlusExtService;
+    @Autowired
     IUserIncrementService userIncrementService;
     @Autowired
     ICameraIncrementLogService cameraIncrementLogService;
@@ -171,7 +171,8 @@ public class AppCameraService {
         cameraDetailService.uploadUserCameraInfo(cameraEntity.getId(),cameraVersion,appVersion);
     }
 
-    public AppCameraSpace checkCameraSpace(String snCode) {
+
+    public AppCameraSpace checkCameraSpace(String snCode,String unicode) {
         Camera camera = cameraService.getBySnCode(snCode);
         if(camera == null){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6029, CameraConstant.FAILURE_MSG_6029);
@@ -185,6 +186,11 @@ public class AppCameraService {
             Long proCount = sceneProService.getCountByCameraId(cameraDetail.getCameraId());
             Long pulsCount = scenePlusService.getCountByCameraId(cameraDetail.getCameraId());
             sapce = proCount + pulsCount;
+            ScenePro scenePro = sceneProService.getByUnicode(unicode);
+            ScenePlusExt scenePlusExt = scenePlusExtService.getByUnicode(unicode);
+            if(scenePro != null || scenePlusExt !=null){
+                sapce -=1;
+            }
         }
         Long totalSpace = cameraDetailService.getTotalSpaceByCameraId(cameraDetail);
         if(totalSpace != -1){

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

@@ -228,8 +228,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                     }
                     if("SP".equals(responseCamera.getUnit())){
                         if(incrementType != null && "SE".equals(userIncrement.getMemberLevels()) && DateUserUtil.getDate(dayTime).getTime() > new Date().getTime() ){  //高级会员 50G容量
-                            totalSpaceStr = incrementType.getCameraSpace() + ".00";
-                            totalSpace = incrementType.getCameraSpace() + ".00";
+                            totalSpaceStr = String.valueOf(incrementType.getCameraSpace());
+                            totalSpace = String.valueOf(incrementType.getCameraSpace());
                         }
                     }
                     if(totalSpace!=null){