1

src/main/java/com/fdkankan/fusion/down/FusionDownService.java

@@ -8,6 +8,7 @@ import com.deepoove.poi.XWPFTemplate;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.*;
+import com.fdkankan.fusion.config.CacheUtil;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.httpClient.LaserService;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
@@ -194,7 +195,6 @@ public class FusionDownService {
         jsonObject.put(basePath+caseFusionInfo+fusionId, ResultData.ok(caseFusion));
 
         List<FusionNumVo> sceneListVo = caseFusionService.getSceneListVo(fusionId);
-        jsonObject.put(basePath+caseFusionList+fusionId, ResultData.ok(sceneListVo));
 
         List<MapConfig> list = mapConfigService.list();
         jsonObject.put(basePath+mapConfig, ResultData.ok(list));
@@ -205,22 +205,22 @@ public class FusionDownService {
             downResource(caseSetting.getBack(),caseOffPath);
             downResource(caseSetting.getCover(),caseOffPath);
         }
-
+        HashMap<String,String> repMap = new HashMap<>();
         jsonObject.put(basePath+fusionMeter+fusionId, ResultData.ok(fusionMeterService.getListByFusionId(fusionId,null)));
 
         List<FusionNumVo> fusionNumVos = caseFusionService.getSceneListVo(fusionId);
         for (FusionNumVo fusionNumVo : fusionNumVos) {
             SceneVo sceneData = fusionNumVo.getSceneData();
             //下载模型
-            sceneData.setCutModelPath(sceneData.getCutModelPath().replace("/oss/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
-            sceneData.setSceneJsonPath(sceneData.getSceneJsonPath().replace("/oss/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
-            sceneData.setSurveillancePath(sceneData.getSurveillancePath().replace("/oss/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
-
             if(StringUtils.isNotBlank(sceneData.getModelGlbUrl())){
                 downModel(sceneData.getModelGlbUrl(),caseOffPath);
             }
             if(sceneData.getType() != 3){
                 //下载场景离线包
+                repMap.put(sceneData.getCutModelPath(),sceneData.getCutModelPath().replace("/"+ CacheUtil.queryPath+"/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
+                repMap.put(sceneData.getSceneJsonPath(),sceneData.getSceneJsonPath().replace("/"+CacheUtil.queryPath+"/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
+                repMap.put(sceneData.getSurveillancePath(),sceneData.getSurveillancePath().replace("/"+CacheUtil.queryPath+"/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
+
                 downSwkk(caseOffPath,sceneData.getNum(),sceneData.getType());
             }
             if(NumTypeUtils.isLaser(sceneData.getType())){
@@ -253,7 +253,7 @@ public class FusionDownService {
                 }
             }
         }
-        jsonObject.put(basePath+caseFusionInfo+fusionId, ResultData.ok(fusionNumVos));
+        jsonObject.put(basePath+caseFusionList+fusionId, ResultData.ok(sceneListVo));
 
         List<HotIcon> hotIconList = hotIconService.getListByFusionId(fusionId);
         for (HotIcon hotIcon : hotIconList) {
@@ -286,10 +286,18 @@ public class FusionDownService {
         }
 
         List<CaseAnimation> listByFusionId = caseAnimationService.getListByFusionId(fusionId);
+        for (CaseAnimation caseAnimation : listByFusionId) {
+            downModel(caseAnimation.getUrl(),caseOffPath);
+        }
         jsonObject.put(basePath+caseAnimationUrl+fusionId, ResultData.ok(listByFusionId));
+        String jsonString = jsonObject.toJSONString();
+        if(!repMap.isEmpty()){
+            for (String key : repMap.keySet()) {
+                jsonString = jsonString.replace(key,repMap.get(key));
+            }
+        }
 
-
-        FileUtil.writeString(jsonObject.toJSONString(), caseOffPath+"/package/"+jsonDataName,"UTF-8");
+        FileUtil.writeString(jsonString, caseOffPath+"/www/package/"+jsonDataName,"UTF-8");
 
     }
 
@@ -298,7 +306,6 @@ public class FusionDownService {
     //http://127.0.0.1:8080/offline.html?caseId=362&app=1&share=1#/show/summary
 
     static String batName = "start-browser.bat";
-    static String batName2 = "信创环境启动（打开后选在终端运行）.sh";
    public void cpIndexHtml(Integer caseId,String caseOfflinePath){
        log.info("down-offline-cpIndexHtml:{}",caseId);
 
@@ -308,10 +315,6 @@ public class FusionDownService {
        s = s.replaceAll("@caseId", String.valueOf(caseId));
        FileUtil.writeString(s, caseOfflinePath + File.separator + batName,"UTF-8");
 
-       String s1 = FileUtil.readString(caseOfflinePath + File.separator + batName2, StandardCharsets.UTF_8);
-       s1 = s1.replaceAll("@caseId", String.valueOf(caseId));
-       FileUtil.writeString(s1, caseOfflinePath + File.separator + batName2,"UTF-8");
-
    }