|
@@ -482,7 +482,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
String fdagePaht = dataSource.replace("/mnt/data","home") +"/data.fdage";
|
|
|
localPathFdage = String.format(OssPath.localFdagePath,fdagePaht);
|
|
|
String fileContent = fYunFileServiceInterface.getFileContent(fdagePaht);
|
|
|
- String fdagebak = fileContent;
|
|
|
JSONObject jsonObject = updateFdageJson(JSONObject.parseObject(fileContent), newSnCode);
|
|
|
FileUtils.writeFile(localPathFdage ,JSONObject.toJSONString(jsonObject));
|
|
|
|
|
@@ -495,12 +494,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
fYunFileServiceInterface.copyFileInBucket(oldFdagePaht,newFdagePath);
|
|
|
delPath = oldFdagePaht;
|
|
|
}
|
|
|
+ fYunFileServiceInterface.uploadFile(localPathFdage,newFdagePath+"/data.fdage");
|
|
|
+ log.info("updateFdage--localPathFdage:{},newFdagePath:{}",localPathFdage,newFdagePath);
|
|
|
+
|
|
|
String newDataSource = newFdagePath.replace("home","/mnt/data");
|
|
|
this.updateDataSource(scenePro,scenePlus,newDataSource);
|
|
|
if(delPath != null){
|
|
|
fYunFileServiceInterface.deleteFolder(oldFdagePaht);
|
|
|
}
|
|
|
- sceneMoveLogService.saveLog(scenePro,scenePlus,oldSnCode,newSnCode,dataSource,newDataSource,fdagebak);
|
|
|
+ sceneMoveLogService.saveLog(scenePro,scenePlus,oldSnCode,newSnCode,dataSource,newDataSource, fileContent);
|
|
|
}catch (Exception e){
|
|
|
log.error("updateFdage-error:oldSnCode:{},newSnCode:{},dataSource:{}",oldSnCode,newSnCode,dataSource);
|
|
|
log.error("updateFdage-error:",e);
|