场景计算封存状态统计方式变更

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

@@ -60,11 +60,12 @@ public class ExceedSpaceSceneServiceImpl extends ServiceImpl<IExceedSpaceSceneMa
             scene.setUnicode(unicode);
             this.save(scene);
 
+            // TODO: 2023/7/11 由于八目相机有bug，第一次请求返回成功后，还是会请求第二次，第二次请求检测data.fdage不存在会导致请求失败，所以这个版本先不删除原始资源
             //删除原始资源
-            if(fileId.length() > 1 && unicode.length() > 1){
-                String homePath = ConstantFilePath.OSS_PREFIX.concat(snCode).concat("/").concat(fileId).concat("/").concat(unicode);
-                fYunFileService.deleteFolder(homePath);
-            }
+//            if(fileId.length() > 1 && unicode.length() > 1){
+//                String homePath = ConstantFilePath.OSS_PREFIX.concat(snCode).concat("/").concat(fileId).concat("/").concat(unicode);
+//                fYunFileService.deleteFolder(homePath);
+//            }
 
             //记录删除原始资源记录
             SceneCleanOrig sceneCleanOrig = new SceneCleanOrig();

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

@@ -118,8 +118,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
         LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<ScenePlus>()
                 .eq(ScenePlus::getCameraId, cameraId)
-                .in(ScenePlus::getSceneStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code())
-                .eq(ScenePlus::getPayStatus, PayStatus.PAY.code());
+                .in(ScenePlus::getSceneStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code());
 
         SpaceType spaceType = SpaceType.get(spaceTypeStr);
         switch (spaceType){
@@ -135,6 +134,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                     return Objects.isNull(space) ? 0L : space;
                 }).sum();
             case SP:
+                wrapper.eq(ScenePlus::getPayStatus, PayStatus.PAY.code());
                 return this.count(wrapper);
         }
         return null;

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

@@ -36,8 +36,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public Long sumUsedSpaceByCameraId(Long cameraId, String spaceTypeStr) {
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<ScenePro>()
                 .eq(ScenePro::getCameraId, cameraId)
-                .in(ScenePro::getStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code())
-                .eq(ScenePro::getPayStatus, PayStatus.PAY.code());
+                .in(ScenePro::getStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code());
 
         SpaceType spaceType = SpaceType.get(spaceTypeStr);
         switch (spaceType){
@@ -52,6 +51,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     return Objects.isNull(space) ? 0L : space;
                 }).sum();
             case SP:
+                wrapper.eq(ScenePro::getPayStatus, PayStatus.PAY.code());
                 return this.count(wrapper);
         }
         return 0L;