소스 검색

读取vision.txt获取全景图列表

dsx 2 년 전
부모
커밋
ee75324d43

+ 17 - 17
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -360,23 +360,23 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         });
     }
 
-    private void cachePanorama(String dataSource, String num){
-        String cachedImagesPath = String.format(ConstantFilePath.SCENE_CACHE_IMAGES, num);
-        //将全景图缓存到缓存目录
-        List<String> imagesList = FileUtil.listFileNames(dataSource + "/caches/images");
-        //先清除旧的全景图
-        cn.hutool.core.io.FileUtil.del(cachedImagesPath);
-        String visionPath = dataSource + "/results/vision.txt";
-        List<String> panoramaImageList = SceneUtil.getPanoramaImageList(visionPath);
-        imagesList.stream().forEach(fileName -> {
-            if (panoramaImageList.contains(fileName)) {
-                String srcPath = dataSource + "/caches/images/" + fileName;
-                String targetPath = cachedImagesPath + fileName;
-                log.info("源文件:{}, 目标文件:{}", srcPath, targetPath);
-                cn.hutool.core.io.FileUtil.copy(srcPath, targetPath, true);
-            }
-        });
-    }
+//    private void cachePanorama(String dataSource, String num){
+//        String cachedImagesPath = String.format(ConstantFilePath.SCENE_CACHE_IMAGES, num);
+//        //将全景图缓存到缓存目录
+//        List<String> imagesList = FileUtil.listFileNames(dataSource + "/caches/images");
+//        //先清除旧的全景图
+//        cn.hutool.core.io.FileUtil.del(cachedImagesPath);
+//        String visionPath = dataSource + "/results/vision.txt";
+//        List<String> panoramaImageList = SceneUtil.getPanoramaImageList(visionPath);
+//        imagesList.stream().forEach(fileName -> {
+//            if (panoramaImageList.contains(fileName)) {
+//                String srcPath = dataSource + "/caches/images/" + fileName;
+//                String targetPath = cachedImagesPath + fileName;
+//                log.info("源文件:{}, 目标文件:{}", srcPath, targetPath);
+//                cn.hutool.core.io.FileUtil.copy(srcPath, targetPath, true);
+//            }
+//        });
+//    }
 
     private Map<String, String> getUploadFiles(ScenePlus scenePlus,String path,Integer cameraType,JSONObject fdageData) throws Exception {
         if (ObjectUtils.isEmpty(scenePlus)) {

+ 3 - 1
src/main/java/com/fdkankan/contro/mq/service/impl/CommonServiceImpl.java

@@ -39,7 +39,9 @@ public class CommonServiceImpl implements ICommonService {
         if(FileUtil.exist(localCachesImagePath)){
             List<String> imagesList = FileUtil.listFileNames(localCachesImagePath);
             if(CollUtil.isNotEmpty(imagesList)){
-                String visionPath = dataSource + "/results/vision.txt";
+                String ossVisionPath = String.format(UploadFilePath.IMG_VIEW_PATH, num) + "vision.txt";
+                String visionPath = String.format(ConstantFilePath.SCENE_DATA_PATH_V4, num) + "vision.txt";
+                fYunFileServiceInterface.downloadFile(ossVisionPath, visionPath);
                 List<String> panoramaImageList = SceneUtil.getPanoramaImageList(FileUtil.readUtf8String(visionPath));
                 imagesList.stream().forEach(fileName -> {
                     if (panoramaImageList.contains(fileName)) {