|
@@ -467,7 +467,11 @@ public class CommonServiceImpl implements ICommonService {
|
|
SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt,Company company){
|
|
SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt,Company company){
|
|
String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
|
|
String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
|
|
|
|
|
|
- String oldSceneJson = fYunFileServiceInterface.getFileContent(dataViewPath + "scene.json");
|
|
|
|
|
|
+ String sceneJsonKey = dataViewPath + "scene.json";
|
|
|
|
+ String oldSceneJson = null;
|
|
|
|
+ if(fYunFileService.fileExist(sceneJsonKey)){
|
|
|
|
+ oldSceneJson = fYunFileServiceInterface.getFileContent(sceneJsonKey);
|
|
|
|
+ }
|
|
|
|
|
|
SceneJsonBean sceneJson = new SceneJsonBean();
|
|
SceneJsonBean sceneJson = new SceneJsonBean();
|
|
BeanUtil.copyProperties(sceneEditInfoExt, sceneJson, "started");
|
|
BeanUtil.copyProperties(sceneEditInfoExt, sceneJson, "started");
|