1

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

@@ -49,6 +49,8 @@ public interface IScenePlusService extends IService<ScenePlus> {
     Result getArPathByNum(String num);
 
     Long getCountByCameraId(Long cameraId,Boolean statsu);
+    Long getCountByCameraId(Long cameraId);
+
 
     Long getSpaceSumByCameraId(Long cameraId);
 }

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

@@ -91,7 +91,9 @@ public interface ISceneProService extends IService<ScenePro> {
 
     List<SimpleSceneVo> getSimpleSceneVo(Long cameraId);
 
-    Long getCountByCameraId(Long cameraId,Boolean status);
+    Long getCountByCameraId(Long cameraId,Boolean stauts);
+
+    Long getCountByCameraId(Long cameraId);
 
     Long getSpaceSumByCameraId(Long cameraId);
 }

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

@@ -327,7 +327,9 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
                 return true;
             }
             totalSpace = incrementType != null ?incrementType.getCameraSpace() : detailEntity.getTotalSpace();
-            return detailEntity.getUsedSpace() + 1 <= totalSpace;
+            Long proCount = sceneProService.getCountByCameraId(detailEntity.getCameraId());
+            Long plusCount = scenePlusService.getCountByCameraId(detailEntity.getCameraId());
+            return proCount + plusCount + 1 <= totalSpace;
         }
         if("GB".equals(detailEntity.getUnit())){
             if(incrementType!=null && incrementType.getCameraCapacity() == -1){

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

@@ -416,6 +416,14 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
+    public Long getCountByCameraId(Long cameraId) {
+        LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePlus::getCameraId,cameraId);
+        wrapper.in(ScenePlus::getSceneStatus,0,-2);
+        return this.count(wrapper);
+    }
+
+    @Override
     public Long getSpaceSumByCameraId(Long cameraId) {
         return this.getBaseMapper().getSpaceSumByCameraId(cameraId);
     }

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

@@ -1329,6 +1329,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
+    public Long getCountByCameraId(Long cameraId) {
+        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePro::getCameraId,cameraId);
+        wrapper.eq(ScenePro::getIsUpgrade,0);
+        wrapper.in(ScenePro::getStatus,0,-2);
+        return this.count(wrapper);
+    }
+
+    @Override
     public Long getSpaceSumByCameraId(Long cameraId) {
         return this.getBaseMapper().getSpaceSumByCameraId(cameraId);
     }