|
@@ -171,7 +171,7 @@ public class SceneCommonService {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- public void updateOssJson(String targetPath,String oldNum, String newNum,String oldTitle,String newTitle,String fileName) {
|
|
|
|
|
|
+ public void updateOssJson(String targetPath,String oldNum, String newNum,String vision,String newTitle,String fileName) {
|
|
String ossStatusJsonPath = targetPath + fileName;
|
|
String ossStatusJsonPath = targetPath + fileName;
|
|
|
|
|
|
if(!fYunFileServiceInterface.fileExist(ossStatusJsonPath)){
|
|
if(!fYunFileServiceInterface.fileExist(ossStatusJsonPath)){
|
|
@@ -186,8 +186,16 @@ public class SceneCommonService {
|
|
String fileContent = fYunFileServiceInterface.getFileContent(ossStatusJsonPath);
|
|
String fileContent = fYunFileServiceInterface.getFileContent(ossStatusJsonPath);
|
|
if(StringUtils.isNotBlank(fileContent)){
|
|
if(StringUtils.isNotBlank(fileContent)){
|
|
String newJson = fileContent.replaceAll(oldNum,newNum);
|
|
String newJson = fileContent.replaceAll(oldNum,newNum);
|
|
- newJson = newJson.replaceAll(oldTitle,newTitle);
|
|
|
|
try {
|
|
try {
|
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(newJson);
|
|
|
|
+ if(fileName.contains("scene.json")){
|
|
|
|
+ if("v3".equals(vision)){
|
|
|
|
+ jsonObject.put("sceneName",newTitle);
|
|
|
|
+ }
|
|
|
|
+ if("v4".equals(vision)) {
|
|
|
|
+ jsonObject.put("title",newTitle);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
com.fdkankan.manage_jp.util.FileUtil.writeFile(localPath,newJson);
|
|
com.fdkankan.manage_jp.util.FileUtil.writeFile(localPath,newJson);
|
|
fYunFileServiceInterface.uploadFile(localPath,ossStatusJsonPath);
|
|
fYunFileServiceInterface.uploadFile(localPath,ossStatusJsonPath);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
@@ -285,8 +293,8 @@ public class SceneCommonService {
|
|
|
|
|
|
//修改 oss status.json ,nas scene.json
|
|
//修改 oss status.json ,nas scene.json
|
|
String targetData = String.format(SceneResourcePath.DATA_VIEW_PATH,newNum);
|
|
String targetData = String.format(SceneResourcePath.DATA_VIEW_PATH,newNum);
|
|
- this.updateOssJson(targetData,oldNum,newNum,oldSceneName, scenePlus.getTitle(),"status.json");
|
|
|
|
- this.updateOssJson(targetData,oldNum,newNum,oldSceneName, scenePlus.getTitle(),"scene.json");
|
|
|
|
|
|
+ this.updateOssJson(targetData,oldNum,newNum,"v4", scenePlus.getTitle(),"status.json");
|
|
|
|
+ this.updateOssJson(targetData,oldNum,newNum,"v4", scenePlus.getTitle(),"scene.json");
|
|
//修改马赛克图片
|
|
//修改马赛克图片
|
|
this.updateOssFileName(oldNum,newNum);
|
|
this.updateOssFileName(oldNum,newNum);
|
|
|
|
|
|
@@ -405,8 +413,8 @@ public class SceneCommonService {
|
|
String targetData = String.format(SceneResourcePath.dataPath, scenePro.getNum());
|
|
String targetData = String.format(SceneResourcePath.dataPath, scenePro.getNum());
|
|
this.copyOssAndNas(oldNum,scenePro.getNum(),sourceData,targetData);
|
|
this.copyOssAndNas(oldNum,scenePro.getNum(),sourceData,targetData);
|
|
//修改 oss status.json ,nas scene.json
|
|
//修改 oss status.json ,nas scene.json
|
|
- this.updateOssJson(targetData,oldNum,newNum,oldSceneName, scenePro.getSceneName(),"status.json");
|
|
|
|
- this.updateOssJson(targetData,oldNum,newNum,oldSceneName, scenePro.getSceneName(),"scene.json");
|
|
|
|
|
|
+ this.updateOssJson(targetData,oldNum,newNum,"v3", scenePro.getSceneName(),"status.json");
|
|
|
|
+ this.updateOssJson(targetData,oldNum,newNum,"v3", scenePro.getSceneName(),"scene.json");
|
|
|
|
|
|
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());
|