lyhzzz 19 hodín pred
rodič
commit
461644e580

+ 4 - 0
src/main/java/com/fdkankan/fusion/down/FusionDownService.java

@@ -249,6 +249,10 @@ public class FusionDownService {
         for (FusionNumVo fusionNumVo : fusionNumVos) {
             SceneVo sceneData = fusionNumVo.getSceneData();
             //下载模型
+            sceneData.setCutModelPath(sceneData.getCutModelPath().replace("/"+sceneData.getMapping()+"/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
+            sceneData.setSceneJsonPath(sceneData.getSceneJsonPath().replace("/"+sceneData.getMapping()+"/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
+            sceneData.setSurveillancePath(sceneData.getSurveillancePath().replace("/"+sceneData.getMapping()+"/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
+
             if(StringUtils.isNotBlank(sceneData.getModelGlbUrl())){
                 downModel(sceneData.getModelGlbUrl(),caseOffPath);
             }

+ 3 - 3
src/main/java/com/fdkankan/fusion/response/SceneVo.java

@@ -72,21 +72,21 @@ public class SceneVo extends Model {
 
     public String getCutModelPath() {
         if(StringUtils.isNotBlank(num) ){
-            return "/swkk/"+num +"/wwwroot/"+ String.format(FilePath.OBJ_OSS_PATH,num)+"/user/cutModel.json";
+            return "/"+mapping+"/"+ String.format(FilePath.OBJ_OSS_PATH,num)+"/user/cutModel.json";
         }
         return cutModelPath;
     }
 
     public String getSurveillancePath() {
         if(StringUtils.isNotBlank(num)){
-            return"/swkk/"+num +"/wwwroot/"+ String.format(FilePath.OBJ_OSS_PATH,num)+"/user/surveillance.json";
+            return "/"+mapping+"/"+ String.format(FilePath.OBJ_OSS_PATH,num)+"/user/surveillance.json";
         }
         return surveillancePath;
     }
 
     public String getSceneJsonPath() {
         if(StringUtils.isNotBlank(num)){
-            return "/swkk/"+num +"/wwwroot/"+ String.format(FilePath.OBJ_OSS_PATH,num)+"/data/scene.json";
+            return "/"+mapping+"/"+ String.format(FilePath.OBJ_OSS_PATH,num)+"/data/scene.json";
         }
         return sceneJsonPath;
     }