|
@@ -158,35 +158,13 @@ public class BuildObjServiceImpl implements IBuildSceneService {
|
|
|
@Override
|
|
|
public void downLoadSource(BuildSceneCallMessage message,String path) throws Exception{
|
|
|
|
|
|
- ScenePro scenePro = sceneProService.getByNum(message.getSceneNum());
|
|
|
- String version = "V4";
|
|
|
- if(Objects.nonNull(scenePro) && scenePro.getIsUpgrade() != CommonStatus.YES.code().intValue()){
|
|
|
- version = "V3";
|
|
|
- }
|
|
|
+ //下载原始资源文件
|
|
|
+ String ossPath = commonService.getOssOrignPath(path);
|
|
|
+ fYunFileService.downloadFileByCommand(path + File.separator + "capture", ossPath);
|
|
|
|
|
|
- if(SceneVersionType.V4.code().equals(version)){
|
|
|
- String ossResultPath = String.format(UploadFilePath.scene_result_data_path, message.getSceneNum());
|
|
|
- fYunFileService.downloadFile(ossResultPath + "caches/reconstruction/final.bin", path + "/caches/reconstruction/final.bin");
|
|
|
- fYunFileService.downloadFile(ossResultPath + "caches/reconstruction/chunk.json", path + "/caches/reconstruction/chunk.json");
|
|
|
- fYunFileService.downloadFile(ossResultPath + "caches/floor_group_fix.json", path + "/caches/floor_group_fix.json");
|
|
|
- fYunFileService.downloadFileByCommand(path + "/caches/images/", ossResultPath + "caches/images/");
|
|
|
- fYunFileService.downloadFileByCommand( path + "/caches/depthmap_csc/" , ossResultPath + "caches/depthmap_csc/");
|
|
|
- fYunFileService.downloadFileByCommand( path + "/caches/depthmap_vis/", ossResultPath + "caches/depthmap_vis/");
|
|
|
- fYunFileService.downloadFileByCommand( path + "/caches/depthmap/", ossResultPath + "caches/depthmap/");
|
|
|
- fYunFileService.downloadFile(ossResultPath + "caches/panorama.json", path + "/caches/panorama.json");
|
|
|
- fYunFileService.downloadFile(ossResultPath + "results/laserData/laser.ply", path + "/results/laserData/laser.ply");
|
|
|
- }else{
|
|
|
- String prevoisPath = message.getBuildContext().get("previousPath").toString();
|
|
|
- FileUtils.copyFile(prevoisPath + "/caches/reconstruction/final.bin", path + "/caches/reconstruction/final.bin", true);
|
|
|
- FileUtils.copyFile(prevoisPath + "/caches/reconstruction/chunk.json", path + "/caches/reconstruction/chunk.json", true);
|
|
|
- FileUtils.copyFile(prevoisPath + "/caches/floor_group_fix.json", path + "/caches/floor_group_fix.json", true);
|
|
|
- FileUtils.copyDirectiory(prevoisPath + "/caches/images", path + "/caches/images");
|
|
|
- FileUtils.copyDirectiory(prevoisPath + "/caches/depthmap_csc", path + "/caches/depthmap_csc");
|
|
|
- FileUtils.copyDirectiory(prevoisPath + "/caches/depthmap_vis", path + "/caches/depthmap_vis");
|
|
|
- FileUtils.copyDirectiory(prevoisPath + "/caches/depthmap", path + "/caches/depthmap");
|
|
|
- FileUtils.copyFile(prevoisPath + "/caches/panorama.json", path + "/caches/panorama.json", true);
|
|
|
- FileUtils.copyFile(prevoisPath + "/results/laserData/laser.ply", path + "/results/laserData/laser.ply", true);
|
|
|
- }
|
|
|
+ //下载caches/image,算法会执行快一些
|
|
|
+ String ossResultPath = String.format(UploadFilePath.scene_result_data_path, message.getSceneNum());
|
|
|
+ fYunFileService.downloadFileByCommand(path + "/caches/images/", ossResultPath + "caches/images/");
|
|
|
}
|
|
|
|
|
|
@Override
|