From fc942f8fce38daf4f1641c0f105fdc3117b5485f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 19 六月 2023 17:17:08 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/UploadService.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index 3efcf9d..aabfb81 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -317,6 +317,9 @@
                 case StaticData.SHP:
                     copyMultiFile(mf, StaticData.SHP_EXT);
                     break;
+                case StaticData.OSGB:
+                    copyFolderFile(mf);
+                    break;
                 case StaticData.GDB:
                     if (gdbList.contains(mf.getPath())) {
                         String path = findPathByGuid(list, mf);
@@ -445,15 +448,11 @@
             return;
         }
 
-        newFile.mkdirs();
-        File[] files = file.listFiles();
-        if (null == files || files.length == 0) {
-            return;
-        }
-
-        for (File f : files) {
-            String subFile = targetPath + File.separator + FileHelper.getFileName(f.getPath());
-            f.renameTo(new File(subFile));
+        try {
+            newFile.mkdirs();
+            FileUtils.moveDirectory(file, newFile);
+        } catch (Exception ex) {
+            log.error(ex);
         }
         mf.setPath(subPath);
     }

--
Gitblit v1.9.3