فهرست منبع

Merge branch 'release-4.14.4' into test

dengsixing 2 هفته پیش
والد
کامیت
04ceed7e00
1فایلهای تغییر یافته به همراه11 افزوده شده و 2 حذف شده
  1. 11 2
      src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

+ 11 - 2
src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -1293,11 +1293,20 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         //下载mesh到本地
         String meshOssPath = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "mesh/";
-        String meshLocalPath = String.format(ConstantFilePath.SCENE_DATA_PATH_V4, num) + "mesh";
+        String meshLocalPath = String.format(ConstantFilePath.SCENE_DATA_PATH_V4, num) + "mesh/";
         String zipName = num + "_mesh.zip";
         String zipFilePath = String.format(ConstantFilePath.SCENE_DATA_PATH_V4, num) + zipName;
+        List<String> keys = fYunFileService.listRemoteFiles(bucket, meshOssPath);
         //下载
-        fYunFileService.downloadFileByCommand(bucket, meshLocalPath, meshOssPath);
+        keys.stream().filter(v->{
+            if(v.contains("/mesh/floor_") && !v.contains("lod_0")){
+                return false;
+            }
+            return true;
+        }).forEach(v->{
+            fYunFileService.downloadFile(bucket, v, v.replace(meshOssPath, meshLocalPath));
+        });
+//        fYunFileService.downloadFileByCommand(bucket, meshLocalPath, meshOssPath);
         //打包
         ZipUtil.zip(meshLocalPath,zipFilePath);
         //上传压缩包