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

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

@@ -265,6 +265,11 @@ public class BuildObjServiceImpl implements IBuildSceneService {
                 ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
                 scenePlusExt.setAlgorithmTime(Calendar.getInstance().getTime());
 
+                //计算容量
+                Long space = commonService.getSpace(projectNum);
+                scenePlusExt.setSpace(space);
+
+
                 if(this.modelKind.equals(ModelKind.THREE_D_TILE.code())
                         && CollUtil.isNotEmpty(sdTilesSceneSourceList)
                         && sdTilesSceneSourceList.contains(SceneSource.JG.code())){

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

@@ -290,7 +290,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             commonService.uploadBuildResultData(sceneCode, path, SceneVersionType.V4.code());
 
             //容量统计
-            Long space = this.getSpace(sceneCode);
+            Long space = commonService.getSpace(sceneCode);
 
             //写入数据库
             this.updateDbPlus(scenePlus.getSceneSource(), space, videosJson.toJSONString(), message.getComputeTime(),isObj,scenePlusExt);
@@ -356,15 +356,6 @@ 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)){

src/main/java/com/fdkankan/contro/service/ICommonService.java

@@ -37,4 +37,6 @@ public interface ICommonService {
     void uploadStatusJson(String num, Integer sceneStatus, String webSite, String thumb, Integer payStatus, String uploadPath);
 
     Long getSpaceLimit(CameraDetail cameraDetail);
+
+    Long getSpace(String num);
 }

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

@@ -18,6 +18,7 @@ import com.fdkankan.contro.factory.UserEditData.UserEditDataHandlerFactory;
 import com.fdkankan.contro.service.ICommonService;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.vo.ScenePlusVO;
+import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
@@ -76,6 +77,10 @@ public class CommonServiceImpl implements ICommonService {
     private IIncrementTypeService incrementTypeService;
     @Autowired
     private ICameraService cameraService;
+    @Autowired
+    private FYunFileServiceInterface fYunFileService;
+    @Autowired
+    private FYunFileConfig fYunFileConfig;
 
     @Override
     public void uploadBuildResultData(String num, String dataSource, String version) {
@@ -320,4 +325,14 @@ public class CommonServiceImpl implements ICommonService {
         }
         return limit;
     }
+
+    @Override
+    public 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;
+    }
 }