修改构建结果处理逻辑

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

@@ -337,7 +337,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
         String projectNum = scenePlus.getNum();
 
-        String dataPath = String.format(UploadFilePath.DATA_VIEW_PATH, projectNum);
+
+        String dataPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, projectNum);
+        String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, projectNum);
         String imagesPath = String.format(UploadFilePath.IMG_VIEW_PATH, projectNum);
         String videoPath = String.format(UploadFilePath.VIDEOS_VIEW_PATH, projectNum);
         String resultsPath = path + File.separator + "results" + File.separator;
@@ -393,7 +395,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 }
 
                 if (fileJson.getIntValue("clazz") == 16) {
-                    map.put(filePath, dataPath + fileName);
+                    map.put(filePath, dataViewPath + fileName);
                 }
 
                 if (fileJson.getIntValue("clazz") == 18) {
@@ -419,15 +421,17 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         map.put(resultsPath + ConstantFileName.modelUUID + "_50k.dam.lzma", imagesPath + ConstantFileName.modelUUID + "_50k.dam.lzma");
         map.put(resultsPath + ConstantFileName.modelUUID + "_50k.dam", imagesPath + ConstantFileName.modelUUID + "_50k.dam");
         FileUtil.touch("/mnt/4Dkankan/scene/data" + File.separator + "data" + projectNum);
-        FileUtils.copyFile(resultsPath + "floorplan.json", "/mnt/4Dkankan/scene/" + dataPath + "floor.json", true);
-        log.info("floor.json路径：" + resultsPath + "floor.json");
-        map.put(resultsPath + "floorplan.json", dataPath + "floor.json");
-        map.put(resultsPath + "floorplan_cad.json", dataPath + "floorplan_cad.json");
-        map.put(path + File.separator + "capture/stitch_params.txt", dataPath + "stitch_params.txt");
-        map.put(path + File.separator + "capture/Up.xml", dataPath + "Up.xml");
-        map.put(path + File.separator + "capture/Up2.xml", dataPath + "Up2.xml");
-        map.put(path + File.separator + "capture/Up.txt", dataPath + "Up.txt");
-        map.put(path + File.separator + "capture/Up2.txt", dataPath + "Up2.txt");
+        if(new File(resultsPath + "floorplan.json").exists()){
+            FileUtils.copyFile(resultsPath + "floorplan.json", "/mnt/4Dkankan/scene/" + dataPath + "floor.json", true);
+            log.info("floor.json路径：" + resultsPath + "floor.json");
+            map.put(resultsPath + "floorplan.json", dataViewPath + "floor.json");
+        }
+        map.put(resultsPath + "floorplan_cad.json", dataViewPath + "floorplan_cad.json");
+        map.put(path + File.separator + "capture/stitch_params.txt", dataViewPath + "stitch_params.txt");
+        map.put(path + File.separator + "capture/Up.xml", dataViewPath + "Up.xml");
+        map.put(path + File.separator + "capture/Up2.xml", dataViewPath + "Up2.xml");
+        map.put(path + File.separator + "capture/Up.txt", dataViewPath + "Up.txt");
+        map.put(path + File.separator + "capture/Up2.txt", dataViewPath + "Up2.txt");
         return map;
 
     }