Merge branch 'task-lyh-inctype2' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/service/IScenePlusService.java

src/main/java/com/fdkankan/ucenter/service/IScenePlusService.java

@@ -47,4 +47,5 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     Result getArPathByNum(String num);
 
+    Long getCountByCameraId(Long cameraId);
 }

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -89,4 +89,6 @@ public interface ISceneProService extends IService<ScenePro> {
     Integer getSceneSourceByNum(String sceneNum);
 
     List<SimpleSceneVo> getSimpleSceneVo(Long cameraId);
+
+    Long getCountByCameraId(Long cameraId);
 }

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

@@ -1,5 +1,6 @@
 package com.fdkankan.ucenter.service.impl;
 
+import com.amazonaws.services.devopsguru.model.ListInsightsOngoingStatusFilter;
 import com.fdkankan.common.constant.AppConstant;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
@@ -179,9 +180,15 @@ public class AppCameraService {
         if(cameraDetail == null){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6029, CameraConstant.FAILURE_MSG_6029);
         }
+        Long sapce = cameraDetail.getUsedSpace();
+        if("SP".equals(cameraDetail.getUnit())){
+            Long proCount = sceneProService.getCountByCameraId(cameraDetail.getCameraId());
+            Long pulsCount = scenePlusService.getCountByCameraId(cameraDetail.getCameraId());
+            sapce = proCount + pulsCount;
+        }
         Long totalSpace = cameraDetailService.getTotalSpaceByCameraId(cameraDetail);
         if(totalSpace != -1){
-            totalSpace = totalSpace - cameraDetail.getUsedSpace();
+            totalSpace = totalSpace - sapce;
             totalSpace = totalSpace < 0 ? 0L : totalSpace;
         }
         return new AppCameraSpace(totalSpace,cameraDetail.getUnit());

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

@@ -282,7 +282,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             if(incrementType!=null && incrementType.getCameraCapacity() == -1){
                 return true;
             }
-            totalSpace = incrementType != null ?incrementType.getCameraCapacity()  * 1024 * 1024 * 1024: detailEntity.getTotalSpace();
+            totalSpace = incrementType != null ?incrementType.getCameraCapacity()  * 1024 * 1024 * 1024L: detailEntity.getTotalSpace();
             return detailEntity.getUsedSpace() + space <= totalSpace;
         }
         return false;
@@ -299,7 +299,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             if(incrementType!=null && incrementType.getCameraCapacity() == -1){
                 return -1L;
             }
-            return incrementType != null ?incrementType.getCameraCapacity() * 1024 * 1024 * 1024 : detailEntity.getTotalSpace();
+            return incrementType != null ?incrementType.getCameraCapacity() * 1024 * 1024 * 1024L : detailEntity.getTotalSpace();
         }
         return 0L;
     }

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

@@ -378,5 +378,10 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
 
-
+    @Override
+    public Long getCountByCameraId(Long cameraId) {
+        LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePlus::getCameraId,cameraId);
+        return this.count(wrapper);
+    }
 }

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

@@ -1253,4 +1253,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         return vo;
     }
+
+    @Override
+    public Long getCountByCameraId(Long cameraId) {
+        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePro::getCameraId,cameraId);
+        wrapper.eq(ScenePro::getIsUpgrade,0);
+        return this.count(wrapper);
+    }
 }

src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: test-eur
 server:
   port: 8082
   servlet: