Merge branch 'task-obj'

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -1187,19 +1187,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             throw new BusinessException(LoginConstant.FAILURE_CODE_3003, "只能操作激光场景");
         }
 
-        // 拷贝文件
-        String path = sceneProEntity.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/floor_group_fix.json").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(sceneProEntity.getNum());
@@ -1248,30 +1235,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
 
-        // 拷贝文件
-        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);