dengsixing преди 3 години
родител
ревизия
f3dd7470eb

+ 13 - 1
src/main/java/com/fdkankan/repair/controller/SceneRepairController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
@@ -18,6 +19,7 @@ import com.fdkankan.repair.httpclient.FdkankanMiniClient;
 import com.fdkankan.repair.service.ISceneProService;
 import com.fdkankan.repair.service.ISceneResourceService;
 import com.fdkankan.repair.service.impl.SceneRepairService;
+import java.io.File;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,7 +74,17 @@ public class SceneRepairController {
     private int maxThread;
 
     @GetMapping("/test")
-    public ResultData test() throws Exception{
+    public ResultData test(String num) throws Exception{
+
+        String mappingOssPath = String.format(UploadFilePath.DATA_EDIT_PATH, num) + "mapping";
+        String mappingPath = "/mnt/4Dkankan/scene/data/data" + num + "/mapping";
+        List<String> mappingList = FileUtils.list(new File(mappingPath));
+        if(CollUtil.isNotEmpty(mappingList)){
+            mappingList.parallelStream().forEach(mapping->{
+                uploadToOssUtil.upload(mapping, mapping.replace(mappingPath, mappingOssPath));
+            });
+        }
+
         return ResultData.ok();
     }
 

+ 9 - 0
src/main/java/com/fdkankan/repair/service/impl/SceneUpgradeToV4Service.java

@@ -439,6 +439,15 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 }
             }
 
+            //本地mapping文件上传
+            String mappingOssPath = String.format(UploadFilePath.DATA_EDIT_PATH, num) + "mapping";
+            String mappingPath = "/mnt/4Dkankan/scene/data/data" + num + "/mapping";
+            List<String> mappingList = FileUtils.list(new File(mappingPath));
+            if(CollUtil.isNotEmpty(mappingList)){
+                mappingList.parallelStream().forEach(mapping->{
+                    uploadToOssUtil.upload(mapping, mapping.replace(mappingPath, mappingOssPath));
+                });
+            }
 
             //生成scene.json
 //        生成新的scene.json,上传至scene_view_data/<num>/data