Merge branch 'project-jmga-2.2.0' into project-jmga-dev

src/main/java/com/fdkankan/contro/mq/listener/UploadSceneListener.java

@@ -212,7 +212,8 @@ public class UploadSceneListener {
         sceneEditInfoExt.setCreateTime(null);
         sceneEditInfoExtService.save(sceneEditInfoExt);
 
-        SceneEditControls sceneEditControls = JSON.parseObject(sceneJsonStr, SceneEditControls.class);
+        JSONObject jsonObject = JSON.parseObject(sceneJsonStr);
+        SceneEditControls sceneEditControls = JSON.parseObject(jsonObject.getString("controls"), SceneEditControls.class);
         sceneEditControls.setId(null);
         sceneEditControls.setEditInfoId(sceneEditInfo.getId());
         sceneEditControls.setCreateTime(null);