|
|
@@ -338,7 +338,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
|
String projectNum = scenePlus.getNum();
|
|
|
|
|
|
|
|
|
- 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);
|
|
|
@@ -383,7 +382,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
|
} else if (fileJson.getIntValue("clazz") == 10) {
|
|
|
String updown = FileUtils.readFile(filePath);
|
|
|
JSONObject updownJson = JSONObject.parseObject(updown);
|
|
|
- FileUtils.writeFile("/mnt/4Dkankan/scene/" + dataPath + fileName.replace("updown", "mapping"), updownJson.toString());
|
|
|
String mappingOssPath = String.format("scene_edit_data/%s/data/", projectNum) + fileName.replace("updown", "mapping");
|
|
|
map.put(filePath, mappingOssPath);
|
|
|
} else {
|
|
|
@@ -421,11 +419,7 @@ 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);
|
|
|
- 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.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");
|
