|
@@ -1085,7 +1085,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
this.update(updateWrapper);
|
|
this.update(updateWrapper);
|
|
|
|
|
|
//同步到scenePlus、scenePlus
|
|
//同步到scenePlus、scenePlus
|
|
- //同步到scenePlus、scenePlus
|
|
|
|
ScenePlus scenePlus = scenePlusService.getByNum(num);
|
|
ScenePlus scenePlus = scenePlusService.getByNum(num);
|
|
if(Objects.nonNull(scenePlus)){
|
|
if(Objects.nonNull(scenePlus)){
|
|
sceneUpgradeMapper.deleteScenePlus(num);
|
|
sceneUpgradeMapper.deleteScenePlus(num);
|
|
@@ -1125,30 +1124,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3007, LoginConstant.FAILURE_MSG_3007);
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3007, LoginConstant.FAILURE_MSG_3007);
|
|
}
|
|
}
|
|
|
|
|
|
- // 拷贝文件
|
|
|
|
- String ossResultPath = String.format(UploadFilePath.scene_result_data_path, num);
|
|
|
|
- String ossReconstruction = ossResultPath + "caches/reconstruction/";
|
|
|
|
- if(!fYunFileService.fileExist(ossReconstruction + "final.bin")
|
|
|
|
- || !fYunFileService.fileExist(ossReconstruction + "chunk.json")
|
|
|
|
- || CollUtil.isEmpty(fYunFileService.listRemoteFiles(ossResultPath + "caches/images"))
|
|
|
|
- || CollUtil.isEmpty(fYunFileService.listRemoteFiles(ossResultPath + "caches/depthmap"))
|
|
|
|
- || CollUtil.isEmpty(fYunFileService.listRemoteFiles(ossResultPath + "caches/depthmap_csc"))
|
|
|
|
- || !fYunFileService.fileExist(ossResultPath + "caches/panorama.json")
|
|
|
|
- || !fYunFileService.fileExist(ossResultPath + "results/laserData/laser.ply")
|
|
|
|
- || !fYunFileService.fileExist(ossResultPath + "caches/floor_group_fix.json")){
|
|
|
|
- throw new BusinessException(SceneConstant.FAILURE_CODE_5038, SceneConstant.FAILURE_MSG_5038);
|
|
|
|
- }
|
|
|
|
-// String path = scenePlusExt.getDataSource();
|
|
|
|
-// if (!new File(path + "/caches/reconstruction/final.bin").exists()
|
|
|
|
-// || !new File(path + "/caches/reconstruction/chunk.json").exists()
|
|
|
|
-// || !new File(path + "/caches/images").exists()
|
|
|
|
-// || !new File(path + "/caches/depthmap").exists()
|
|
|
|
-// || !new File(path + "/caches/depthmap_csc").exists()
|
|
|
|
-// || !new File(path + "/caches/panorama.json").exists()
|
|
|
|
-// || !new File(path + "/results/laserData/laser.ply").exists()) {
|
|
|
|
-// log.error("生成obj缺少必要文件,生成失败!");
|
|
|
|
-// throw new BusinessException(SceneConstant.FAILURE_CODE_5038, SceneConstant.FAILURE_MSG_5038);
|
|
|
|
-// }
|
|
|
|
|
|
|
|
// 获取最新的场景名称
|
|
// 获取最新的场景名称
|
|
JSONObject sceneInfo = fdkkLaserService.getSceneByNum(num);
|
|
JSONObject sceneInfo = fdkkLaserService.getSceneByNum(num);
|