1111

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

@@ -73,37 +73,41 @@ 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) {
+        target = FdkkLaserConfig.getProfile(prefix) + File.separator + target;
+        if(!FileUtil.isDirectory(target) || !FileUtil.exist(target)){
+            FileUtil.mkdir(target);
+        }
+        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(), target, true);
+                }
+            }
+
+        }
+
+    }
+
+    public static void main(String[] args) {
+        boolean directory = FileUtil.isDirectory("D:\\4Amege");
+        System.out.println(directory);
+
+    }
 
     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.uploadFile(bucket, String.format(UploadFilePath.IMG_VIEW_PATH, num) + "3dtiles", tilesPath, false);
+                ossUtil.uploadFileDirCmd(bucket, tilesPath, String.format(UploadFilePath.IMG_VIEW_PATH, num) + "3dtiles", false);
                 //上传mesh
                 ossUtil.deleteObject(bucket, String.format(UploadFilePath.DATA_VIEW_PATH, num) + "mesh");
-                ossUtil.uploadFile(bucket, String.format(UploadFilePath.DATA_VIEW_PATH, num) + "mesh", meshPath,false);
+                ossUtil.uploadFileDirCmd(bucket, meshPath, String.format(UploadFilePath.DATA_VIEW_PATH, num) + "mesh",false);
 
                 //更新版本信息
                 ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);