1111

src/main/java/com/fdkankan/scene/entity/ScenePlus.java

@@ -15,7 +15,7 @@ import lombok.Setter;
  * 场景主表
  * </p>
  *
- * @author 
+ * @author
  * @since 2022-03-16
  */
 @Getter
@@ -119,5 +119,8 @@ public class ScenePlus implements Serializable {
     @TableLogic(value = "A", delval = "I")
     private String recStatus;
 
+    @TableField("otherType")
+    private String otherType;
+
 
 }

src/main/java/com/fdkankan/scene/service/impl/ReverseSceneServiceImpl.java

@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.*;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFileName;
 import com.fdkankan.model.constants.ConstantFilePath;
@@ -55,6 +56,8 @@ public class ReverseSceneServiceImpl implements IReverseSceneService {
     private ISceneEditControlsService sceneEditControlsService;
     @Resource
     private FyunUtil fyunUtil;
+    @Resource
+    FYunFileConfig fYunFileConfig;
 
     @Override
     public void reverseScene(JSONObject jsonObject) throws Exception {
@@ -91,6 +94,7 @@ public class ReverseSceneServiceImpl implements IReverseSceneService {
             scenePlusExt.setWebSite(sceneProNewUrl + num);
             scenePlusExt.setShootCount(shootCount);
             scenePlusExt.setUpdateTime(new Date());
+            scenePlusExt.setSpace(this.getSpace(num));
             scenePlusExtService.updateById(scenePlusExt);
 
             this.genSceneJson(num);
@@ -104,6 +108,15 @@ public class ReverseSceneServiceImpl implements IReverseSceneService {
 
     }
 
+    private Long getSpace(String num){
+        Long space = fileServiceInterface.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.DATA_VIEW_PATH, num));
+        space += fileServiceInterface.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.IMG_VIEW_PATH, num));
+        space += fileServiceInterface.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.VIDEOS_VIEW_PATH, num));
+        space += fileServiceInterface.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.VOICE_VIEW_PATH, num));
+        space += fileServiceInterface.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.scene_result_data_path, num).concat("caches"));
+        return  space;
+    }
+
     private void genSceneJson(String num){
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -493,6 +493,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneInfoVO.setSpace(FileSizeUtil.convert(scenePlusExt.getSpace(), FileSizeUnitType.MB.code()));
         sceneInfoVO.setSns(JSON.parseObject(sceneEditInfoExt.getSnsInfo()));
         sceneInfoVO.setStarted(JSON.parseObject(sceneEditInfoExt.getStarted()));
+        sceneInfoVO.setOtherType(scenePlus.getOtherType());
 
         this.SortBoxVideos(sceneInfoVO);
 

src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -264,5 +264,7 @@ public class SceneInfoVO {
 
     private String orientation;
 
+    private String otherType;
+
 
 }