1111

src/main/java/com/fdkankan/scene/oss/OssUtil.java

@@ -2,7 +2,9 @@ package com.fdkankan.scene.oss;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ZipUtil;
 import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.scene.config.FdkkLaserConfig;
 import com.fdkankan.scene.config.ServiceConfig;
@@ -71,38 +73,37 @@ public class OssUtil {
     }
 
 
-    public void uploadFileDirCmd(String prefix, String uploadDir, String target, Boolean isLink) {
-        if(!target.endsWith(File.separator)){
-            target = target.concat(File.separator);
-        }
-        if (FdkkLaserConfig.isBucket()) {
-            if (FdkkLaserConfig.isLocalization()) {
-                minioOssTemplate.uploadFileDirCmd(uploadDir, target);
-            } else {
-                aliyunOssTemplate.uploadFileDirCmd(uploadDir, target);
-            }
-        } else {
-            if (isLink) {
-                String path = FdkkLaserConfig.getProfile(prefix) + File.separator + target;
-                File folder = FileUtil.file(path);
-                if (!FileUtil.exist(folder.getParent())) {
-                    FileUtil.mkdir(folder.getParent());
-                }
-                CmdBuildUtil.MkLinkDir(folder.getAbsolutePath(), FileUtil.file(uploadDir).getAbsolutePath());
-            } else {
-                File[] ls = FileUtil.ls(uploadDir);
-                for (File l : ls) {
-                    FileUtil.copy(
-                            l.getAbsolutePath(),
-                            FdkkLaserConfig.getProfile(prefix) + File.separator + target,
-                            true);
-                }
-            }
-
-        }
-
-    }
-
+//    public void uploadFileDirCmd(String prefix, String uploadDir, String target, Boolean isLink) {
+//        if(!target.endsWith(File.separator)){
+//            target = target.concat(File.separator);
+//        }
+//        if (FdkkLaserConfig.isBucket()) {
+//            if (FdkkLaserConfig.isLocalization()) {
+//                minioOssTemplate.uploadFileDirCmd(uploadDir, target);
+//            } else {
+//                aliyunOssTemplate.uploadFileDirCmd(uploadDir, target);
+//            }
+//        } else {
+//            if (isLink) {
+//                String path = FdkkLaserConfig.getProfile(prefix) + File.separator + target;
+//                File folder = FileUtil.file(path);
+//                if (!FileUtil.exist(folder.getParent())) {
+//                    FileUtil.mkdir(folder.getParent());
+//                }
+//                CmdBuildUtil.MkLinkDir(folder.getAbsolutePath(), FileUtil.file(uploadDir).getAbsolutePath());
+//            } else {
+//                File[] ls = FileUtil.ls(uploadDir);
+//                for (File l : ls) {
+//                    FileUtil.copy(
+//                            l.getAbsolutePath(),
+//                            FdkkLaserConfig.getProfile(prefix) + File.separator + target,
+//                            true);
+//                }
+//            }
+//
+//        }
+//
+//    }
 
     public String uploadFile(String prefix, String pathKey, String filePath, boolean isLink) {
         if (FdkkLaserConfig.isBucket()) {

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

@@ -1053,10 +1053,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 //算法计算完后，生成压缩文件，上传到oss
                 //上传3dtiles
                 ossUtil.deleteObject(bucket, String.format(UploadFilePath.IMG_VIEW_PATH, num) + "3dtiles");
-                ossUtil.uploadFileDirCmd(bucket, tilesPath, String.format(UploadFilePath.IMG_VIEW_PATH, num) + "3dtiles", false);
+                ossUtil.uploadFile(bucket, String.format(UploadFilePath.IMG_VIEW_PATH, num) + "3dtiles", tilesPath, false);
                 //上传mesh
                 ossUtil.deleteObject(bucket, String.format(UploadFilePath.DATA_VIEW_PATH, num) + "mesh");
-                ossUtil.uploadFileDirCmd(bucket, meshPath, String.format(UploadFilePath.DATA_VIEW_PATH, num) + "mesh",false);
+                ossUtil.uploadFile(bucket, String.format(UploadFilePath.DATA_VIEW_PATH, num) + "mesh", meshPath,false);
 
                 //更新版本信息
                 ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);