Merge branch 'feature-容量计算方式改造-20230624-dsx' into test

src/main/java/com/fdkankan/contro/service/impl/ExceedSpaceSceneServiceImpl.java

@@ -75,7 +75,7 @@ public class ExceedSpaceSceneServiceImpl extends ServiceImpl<IExceedSpaceSceneMa
 
             //上传计算失败状态文件
             //上传app状态文件
-            commonService.uploadStatusJson(num,SceneStatus.EXCEED_SPACE.code(),
+            commonService.uploadStatusJson(num,SceneStatus.FAILD.code(),
                     null, null, PayStatus.NOT_PAY.code(),
                     String.format(UploadFilePath.DATA_VIEW_PATH, num));
         }

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -357,7 +357,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
 
         //如果是相机计算容量的模式是场景个数模式，则需要拦截计算
-        if(rebuild == CommonStatus.NO.code()){//新场景需要校验容量是否超出限制
+        if(rebuild == CommonStatus.NO.code() && cameraType != 14){//新场景需要校验容量是否超出限制
             boolean exceedSpace = exceedSpaceSceneService.cehckExceedSpace(sceneNum, cameraDetail, cameraName, fileId, unicode);
             if(exceedSpace){
                 ScenePlusVO scenePlusVO = new ScenePlusVO();