lyhzzz 3 bulan lalu
induk
melakukan
3fab371ce8

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

@@ -383,25 +383,25 @@ public class CaseDownService {
         jsonObject.put(basePath+getMapConfig, ResultData.ok(mapConfigService.list()));
         jsonObject.put(basePath+getMapConfig, ResultData.ok(mapConfigService.list()));
 
 
         String jsonString = JSON.toJSONString(jsonObject);
         String jsonString = JSON.toJSONString(jsonObject);
-        jsonString = jsonString.replaceAll(queryPath,"/oss/");
         if(!replaceMap.isEmpty()){
         if(!replaceMap.isEmpty()){
             for (String key : replaceMap.keySet()) {
             for (String key : replaceMap.keySet()) {
                 jsonString = jsonString.replaceAll(key,replaceMap.get(key));
                 jsonString = jsonString.replaceAll(key,replaceMap.get(key));
             }
             }
         }
         }
+        jsonString = jsonString.replaceAll(queryPath,"/oss/");
         FileUtil.writeString(jsonString, FilePath.OFFLINE_PACKAGE_PATH+caseId+"/www/package/"+jsonDataName,"UTF-8");
         FileUtil.writeString(jsonString, FilePath.OFFLINE_PACKAGE_PATH+caseId+"/www/package/"+jsonDataName,"UTF-8");
 
 
     }
     }
 
 
     private void addReplaceMap(SceneVo sceneData,HashMap<String,String> map) {
     private void addReplaceMap(SceneVo sceneData,HashMap<String,String> map) {
         if(StringUtils.isNotBlank(sceneData.getCutModelPath())){
         if(StringUtils.isNotBlank(sceneData.getCutModelPath())){
-            map.put(sceneData.getCutModelPath(),sceneData.getCutModelPath().replace("/oss/","/swkk/"+sceneData.getNum()+"/wwwroot/"));
+            map.put(sceneData.getCutModelPath(),sceneData.getCutModelPath().replace(queryPath,"/swkk/"+sceneData.getNum()+"/wwwroot/"));
         }
         }
         if(StringUtils.isNotBlank(sceneData.getSurveillancePath())){
         if(StringUtils.isNotBlank(sceneData.getSurveillancePath())){
-            map.put(sceneData.getSurveillancePath(),sceneData.getSurveillancePath().replace("/oss/","/swkk/"+sceneData.getNum()+"/wwwroot/"));
+            map.put(sceneData.getSurveillancePath(),sceneData.getSurveillancePath().replace(queryPath,"/swkk/"+sceneData.getNum()+"/wwwroot/"));
         }
         }
         if(StringUtils.isNotBlank(sceneData.getSceneJsonPath())){
         if(StringUtils.isNotBlank(sceneData.getSceneJsonPath())){
-            map.put(sceneData.getSceneJsonPath(),sceneData.getSceneJsonPath().replace("/oss/","/swkk/"+sceneData.getNum()+"/wwwroot/"));
+            map.put(sceneData.getSceneJsonPath(),sceneData.getSceneJsonPath().replace(queryPath,"/swkk/"+sceneData.getNum()+"/wwwroot/"));
         }
         }
     }
     }