Merge branch 'feature-v4.10.0-20230714-dsx' into test

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -289,9 +289,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             //上传计算结果文件
             commonService.uploadBuildResultData(sceneCode, path, SceneVersionType.V4.code());
 
-            Long space = fYunFileService.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.VIEW_PATH, sceneCode));
-            space += fYunFileService.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.scene_result_data_path, sceneCode).concat("caches"));
-
+            //容量统计
+            Long space = this.getSpace(sceneCode);
 
             //写入数据库
             this.updateDbPlus(scenePlus.getSceneSource(), space, videosJson.toJSONString(), message.getComputeTime(),isObj,scenePlusExt);
@@ -357,6 +356,15 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         }
     }
 
+    private Long getSpace(String num){
+        Long space = fYunFileService.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.DATA_VIEW_PATH, num));
+        space += fYunFileService.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.IMG_VIEW_PATH, num));
+        space += fYunFileService.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.VIDEOS_VIEW_PATH, num));
+        space += fYunFileService.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.VOICE_VIEW_PATH, num));
+        space += fYunFileService.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.scene_result_data_path, num).concat("caches"));
+        return  space;
+    }
+
     private void removeSceneAsynOperLog(String num){
         List<SceneAsynOperLog> list = sceneAsynOperLogService.list(new LambdaQueryWrapper<SceneAsynOperLog>().eq(SceneAsynOperLog::getNum, num));
         if(CollUtil.isEmpty(list)){