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

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

@@ -164,9 +164,13 @@ public class UploadSceneListener {
 
         SceneJsonBean sceneJsonBean = JSONObject.parseObject(FileUtil.readUtf8String(sceneJsonFile), SceneJsonBean.class);
         String sceneViewDataPath = "/oss/4dkankan/" + String.format(UploadFilePath.VIEW_PATH, num);
+        String sceneEditDataPath = "/oss/4dkankan/" + String.format(UploadFilePath.EDIT_PATH, num);
         FileUtil.mkdir(sceneViewDataPath);
+        FileUtil.mkdir(sceneEditDataPath);
         String cpCmd = "cp -p -r " + sourcePath  + "/env/wwwroot/scene_view_data/" + num +"/* " + sceneViewDataPath;
+        String cpEditUserCmd = "cp -p -r " + sourcePath  + "/env/wwwroot/scene_view_data/" + num +"/user " + sceneViewDataPath;
         CmdUtils.callLineSh(cpCmd);
+        CmdUtils.callLineSh(cpEditUserCmd);
 
         sceneJsonBean.setUploadType("offline");
         String sceneJsonKey = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "scene.json";