Merge remote-tracking branch 'origin/feature-slimming-nas-20220130-dsx' into feature-slimming-nas-20220130-dsx

src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -213,6 +213,8 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
 
             Map<String, String> uploadFiles = getUploadFiles(sceneCode,path,cameraType,fdageData);
 
+            copyFiles(path,sceneCode);
+
             //建模成功走以下逻辑
             log.info("cameraType:{}",cameraType);
 
@@ -295,6 +297,16 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
         }
     }
 
+    private void copyFiles(String path, String num) {
+        if (new File(path + File.separator + "results" + File.separator + "floor.json").exists()) {
+            FileUtils.copyFile(path + File.separator + "results" + File.separator + "floor.json", ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + num + File.separator + "floor.json", true);
+        }
+        if (new File(path + File.separator + "results" + File.separator + "floorplan.json").exists()) {
+            FileUtils.copyFile(path + File.separator + "results" + File.separator + "floorplan.json", ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + num + File.separator + "floor.json", true);
+            FileUtils.copyFile(path + File.separator + "results" + File.separator + "floorplan.json", ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + num + File.separator + "floorplan.json", true);
+        }
+    }
+
     private Map<String, String> getUploadFiles(String projectNum,String path,Integer cameraType,JSONObject fdageData) throws Exception {
         String dataViewPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, projectNum);
         String imagesPath = String.format(ConstantFilePath.IMAGE_PATH_FORMAT, projectNum);