|
|
@@ -2015,8 +2015,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
|
|
|
//调用算法切全景图
|
|
|
String ossResultPath = String.format(UploadFilePath.scene_result_data_path, num);
|
|
|
- fYunFileService.downloadFile(bucket, ossResultPath + "data.json", target + File.separator+"data.json");
|
|
|
- fYunFileService.downloadFile(bucket, ossResultPath + "project.json", target + File.separator+"project.json");
|
|
|
+// fYunFileService.downloadFile(bucket, ossResultPath + "data.json", target + File.separator+"data.json");
|
|
|
+// fYunFileService.downloadFile(bucket, ossResultPath + "project.json", target + File.separator+"project.json");
|
|
|
JSONObject visionJson = new JSONObject();
|
|
|
JSONArray visionArray = new JSONArray();
|
|
|
visionJson.put("uuid", sid);
|
|
|
@@ -2029,13 +2029,13 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
|
|
|
//data.json增加extras为执行重建算法
|
|
|
String type = "4k";
|
|
|
- String data = FileUtils.readFile(target + File.separator + "data.json");
|
|
|
- if(data != null){
|
|
|
+// String data = FileUtils.readFile(target + File.separator + "data.json");
|
|
|
+// if(data != null){
|
|
|
JSONObject floorplanJson = new JSONObject();
|
|
|
floorplanJson.put("has_source_images", true);
|
|
|
floorplanJson.put("has_vision_txt", true);
|
|
|
|
|
|
- JSONObject dataJson = JSONObject.parseObject(data);
|
|
|
+ JSONObject dataJson = new JSONObject();
|
|
|
dataJson.put("extras", floorplanJson);
|
|
|
dataJson.put("split_type", "SPLIT_V8");//替换全景图算法
|
|
|
|
|
|
@@ -2054,7 +2054,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
dataJson.put("skybox_type", skyboxType);
|
|
|
|
|
|
cn.hutool.core.io.FileUtil.writeString(dataJson.toString(), target + File.separator+"data.json", StandardCharsets.UTF_8);
|
|
|
- }
|
|
|
+// }
|
|
|
|
|
|
//创建文件夹软连接并且复制data.json和project.json
|
|
|
String capturePath = target + File.separator + "capture";
|
dengsixing