Merge branch 'feature-v4.12.0-dsx' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -233,5 +233,8 @@ public class SceneJsonBean {
      */
     private Integer sceneDraw;
 
+    //动态面板
+    private int dynamicPanel;
+
 
 }

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -116,6 +116,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     private FYunFileConfig fYunFileConfig;
     @Autowired
     private ISceneDrawService sceneDrawService;
+    @Autowired
+    private ISceneDynamicPanelService sceneDynamicPanelService;
 
     @Transactional
     @Override
@@ -272,6 +274,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //发布场景绘制
         sceneDrawService.publicSceneDraw(num, bucket);
 
+        sceneJson.setDynamicPanel(sceneDynamicPanelService.checkDynamicPanel(num));
+
         //本地写sceneJson文件
         String localSceneJsonPath = String.format(ConstantFilePath.SCENE_DATA_PATH_V4, num) + "scene.json";
         FileUtils.writeFile(localSceneJsonPath, JSON.toJSONString(sceneJson));
@@ -499,6 +503,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             sceneInfoVO.getControls().setShowRule(CommonStatus.NO.code().intValue());
         }
 
+        sceneInfoVO.setDynamicPanel(sceneDynamicPanelService.checkDynamicPanel(num));
+
         return sceneInfoVO;
     }
 

src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -259,5 +259,8 @@ public class SceneInfoVO {
      */
     private Integer sceneDraw;
 
+    //动态面板
+    private int dynamicPanel;
+
 
 }