Bladeren bron

替换scene.json中场景名称

lyhzzz 2 jaren geleden
bovenliggende
commit
4207bbff84

+ 8 - 3
src/main/java/com/fdkankan/ucenter/service/impl/SceneCommonService.java

@@ -108,7 +108,7 @@ public class SceneCommonService {
     }
     }
 
 
 
 
-    public void updateNasSceneJson(String targetPath, String oldNum, String newNum,String oldSceneName,String newSceneName,String sceneVersion) {
+    public void updateNasSceneJson(String targetPath, String oldNum, String newNum,String newSceneName,String sceneVersion) {
         String fileContent = null;
         String fileContent = null;
         if("v3".equals(sceneVersion)){
         if("v3".equals(sceneVersion)){
             String localPath = SceneResourcePath.nasBasePath + targetPath + "/" + "scene.json";
             String localPath = SceneResourcePath.nasBasePath + targetPath + "/" + "scene.json";
@@ -136,14 +136,19 @@ public class SceneCommonService {
                 file.getParentFile().mkdirs();
                 file.getParentFile().mkdirs();
             }
             }
             String newJson = fileContent.replaceAll(oldNum,newNum);
             String newJson = fileContent.replaceAll(oldNum,newNum);
-            newJson = newJson.replace(oldSceneName,newSceneName);
+            JSONObject jsonObject = JSONObject.parseObject(newJson);
             try {
             try {
-                com.fdkankan.ucenter.util.FileUtil.writeFile(localPath,newJson);
                 if("v3".equals(sceneVersion)){
                 if("v3".equals(sceneVersion)){
+                    jsonObject.put("sceneName",newSceneName);
+                    com.fdkankan.ucenter.util.FileUtil.writeFile(localPath,jsonObject.toJSONString());
+
                     String sceneJsonPath = String.format(SceneResourcePath.dataPath+"/scene.json", newNum);
                     String sceneJsonPath = String.format(SceneResourcePath.dataPath+"/scene.json", newNum);
                     fYunFileServiceInterface.uploadFile(localPath, sceneJsonPath);
                     fYunFileServiceInterface.uploadFile(localPath, sceneJsonPath);
                 }
                 }
                 if("v4".equals(sceneVersion)){
                 if("v4".equals(sceneVersion)){
+                    jsonObject.put("title",newSceneName);
+                    com.fdkankan.ucenter.util.FileUtil.writeFile(localPath,jsonObject.toJSONString());
+
                     String sceneJsonPath = String.format(SceneResourcePath.DATA_VIEW_PATH+"/scene.json", newNum);
                     String sceneJsonPath = String.format(SceneResourcePath.DATA_VIEW_PATH+"/scene.json", newNum);
                     fYunFileServiceInterface.uploadFile(localPath, sceneJsonPath);
                     fYunFileServiceInterface.uploadFile(localPath, sceneJsonPath);
 
 

+ 1 - 2
src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -176,7 +176,6 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         String oldNum = scenePlus.getNum();
         String oldNum = scenePlus.getNum();
 
 
         Long plusId = scenePlus.getId();
         Long plusId = scenePlus.getId();
-        String oldSceneName = scenePlus.getTitle();
 
 
         ScenePlusExt plusExt = scenePlusExtService.getByPlusId(plusId);
         ScenePlusExt plusExt = scenePlusExtService.getByPlusId(plusId);
         if(plusExt == null){
         if(plusExt == null){
@@ -259,7 +258,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 String targetData = String.format(SceneResourcePath.DATA_VIEW_PATH,newNum);
                 String targetData = String.format(SceneResourcePath.DATA_VIEW_PATH,newNum);
                 sceneCommonService.updateOssJson(targetData,oldNum,newNum,"status.json");
                 sceneCommonService.updateOssJson(targetData,oldNum,newNum,"status.json");
 
 
-                sceneCommonService.updateNasSceneJson(targetData,oldNum,newNum,oldSceneName,scenePlus.getTitle(),"v4");
+                sceneCommonService.updateNasSceneJson(targetData,oldNum,newNum,scenePlus.getTitle(),"v4");
 
 
                 if(scenePlus.getSceneSource() == 4){  //深时复制
                 if(scenePlus.getSceneSource() == 4){  //深时复制
                     String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
                     String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());

+ 1 - 2
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -746,7 +746,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
 
         String oldNum = scenePro.getNum();
         String oldNum = scenePro.getNum();
         Long sceneProId = scenePro.getId();
         Long sceneProId = scenePro.getId();
-        String oldSceneName = scenePro.getSceneName();
 
 
         scenePro.setNum(newNum);
         scenePro.setNum(newNum);
         scenePro.setId(null);
         scenePro.setId(null);
@@ -797,7 +796,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 //修改 oss status.json ,nas scene.json
                 //修改 oss status.json ,nas scene.json
                 sceneCommonService.updateOssJson(targetData,oldNum,newNum,"status.json");
                 sceneCommonService.updateOssJson(targetData,oldNum,newNum,"status.json");
                 sceneCommonService.updateOssJson(targetData,oldNum,newNum,"hot.json");
                 sceneCommonService.updateOssJson(targetData,oldNum,newNum,"hot.json");
-                sceneCommonService.updateNasSceneJson(targetData,oldNum,newNum,oldSceneName,scenePro.getSceneName(),"v3");
+                sceneCommonService.updateNasSceneJson(targetData,oldNum,newNum,scenePro.getSceneName(),"v3");
 
 
                 String sourceImages = String.format(SceneResourcePath.imagesPath, oldNum);
                 String sourceImages = String.format(SceneResourcePath.imagesPath, oldNum);
                 String targetImages = String.format(SceneResourcePath.imagesPath, scenePro.getNum());
                 String targetImages = String.format(SceneResourcePath.imagesPath, scenePro.getNum());