Procházet zdrojové kódy

场景计算完毕上传文件增加上传全景图俯视图上传逻辑

dengsixing před 3 roky
rodič
revize
a4a9736dbd

+ 22 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/BuildScenePostServiceImpl.java

@@ -227,6 +227,9 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
             //上传计算结果中的caches/images和caches/videos
             //上传计算结果中的caches/images和caches/videos
             this.uploadCaches(sceneCode, uploadFiles, path);
             this.uploadCaches(sceneCode, uploadFiles, path);
 
 
+            //上传全景图俯视图
+            this.uploadFloorCad(path, sceneCode, newUploadFiles);
+
             //上传文件
             //上传文件
             uploadToOssUtil.uploadMulFiles(newUploadFiles);
             uploadToOssUtil.uploadMulFiles(newUploadFiles);
             // TODO: 2022/3/11 同时上传一份到旧版本的目录,用于过渡期使用,待重构版本稳定后删除
             // TODO: 2022/3/11 同时上传一份到旧版本的目录,用于过渡期使用,待重构版本稳定后删除
@@ -255,6 +258,25 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
         }
         }
     }
     }
 
 
+    private void uploadFloorCad(String path, String num, Map<String, String> uploadFiles){
+
+        //户型图上传
+        String  userEditPath = UploadFilePath.USER_EDIT_PATH + "floor-cad-%s.%s";
+        String  userViewPath = UploadFilePath.USER_VIEW_PATH + "floor-cad-%s.%s";
+        String floorCadPath = path + "/results/floorplan_cad";
+        List<String> floorCadList = FileUtil.getFileList(floorCadPath);
+        if(CollUtil.isNotEmpty(floorCadList)){
+            floorCadList.stream().forEach(str->{
+                String substring = str.substring(str.lastIndexOf(File.separator) + 1);
+                String[] arr = substring.split("floor");
+                String[] arr2 = arr[1].split("\\.");
+                uploadFiles.put(str, String.format(userEditPath, num, arr2[0], arr2[1]));
+                uploadFiles.put(str, String.format(userViewPath, num, arr2[0], arr2[1]));
+            });
+        }
+
+    }
+
     private void writeSceneJson(String num, JSONObject videosJson, SceneEditInfo sceneEditInfo,SceneEditInfoExt sceneEditInfoExt,
     private void writeSceneJson(String num, JSONObject videosJson, SceneEditInfo sceneEditInfo,SceneEditInfoExt sceneEditInfoExt,
         SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt, boolean arrearCap)  throws Exception{
         SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt, boolean arrearCap)  throws Exception{
         String sceneJsonKey = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "scene.json";
         String sceneJsonKey = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "scene.json";