Browse Source

修改started类型

dsx 1 year ago
parent
commit
c54dca4d72

+ 1 - 1
src/main/java/com/fdkankan/contro/bean/SceneJsonBean.java

@@ -217,7 +217,7 @@ public class SceneJsonBean {
     /**
      * 入场设置
      */
-    private String started;
+    private JSONObject started;
 
 
 }

+ 4 - 1
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -577,7 +577,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         String oldSceneJson = fYunFileService.getFileContent(dataViewPath + "scene.json");
 
         SceneJsonBean sceneJson = new SceneJsonBean();
-        BeanUtil.copyProperties(sceneEditInfoExt, sceneJson);
+        BeanUtil.copyProperties(sceneEditInfoExt, sceneJson, "started");
         BeanUtil.copyProperties(sceneEditInfo, sceneJson);
         SceneEditControlsVO sceneEditControlsVO = BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class);
         sceneJson.setControls(sceneEditControlsVO);
@@ -601,6 +601,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             sceneJson.setBoxVideos(oldSceneJsonBean.getBoxVideos());
             sceneJson.setBoxPhotos(oldSceneJsonBean.getBoxPhotos());
         }
+        if(StrUtil.isNotEmpty(sceneEditInfoExt.getStarted())){
+            sceneJson.setStarted(JSON.parseObject(sceneEditInfoExt.getStarted()));
+        }
 
         if(!ObjectUtils.isEmpty(company)){
             String userViewPath = String.format(UploadFilePath.USER_VIEW_PATH, num);