From 9bce48a9f30f7d80c43f43f46d40df20fcb00e15 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 03 二月 2023 09:39:59 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/all/BaseUploadService.java |   68 ++++++++++++++++++++++++++++-----
 1 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index 22279eb..103b928 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -28,10 +28,10 @@
 @Service
 public class BaseUploadService {
     @Autowired
-    private DirService dirService;
+    protected DirService dirService;
 
     @Autowired
-    private PathHelper pathHelper;
+    protected PathHelper pathHelper;
 
     public final Log log = LogFactory.getLog(getClass());
 
@@ -213,6 +213,7 @@
 
             list.add(meta);
         }
+        setMetaType(list);
 
         return list;
     }
@@ -237,9 +238,43 @@
         ZipHelper.unzip(zipFile, subPath);
 
         List<File> files = new ArrayList<>();
-        FileHelper.getFilesByPath(files, subPath);
+        getFilesByPath(files, subPath);
 
         return getMapperFiles(files, dir, dirs, meta, tempPath.length() + 1);
+    }
+
+    /**
+     * 鏍规嵁璺緞鑾峰彇鏂囦欢
+     */
+    private void getFilesByPath(List<File> list, String path) {
+        File file = new File(path);
+        if (!file.isDirectory()) {
+            String extName = FileHelper.getExtension(file);
+            if (StaticData.ALL_EXTENSION.contains(extName)) {
+                list.add(file);
+            }
+            return;
+        }
+
+        if (isGdbFile(file)) {
+            list.add(file);
+            return;
+        }
+
+        File[] files = file.listFiles();
+        if (null == files) {
+            return;
+        }
+        for (File f : files) {
+            if (f.isDirectory()) {
+                getFilesByPath(list, f.getPath());
+            } else {
+                String extName = FileHelper.getExtension(f);
+                if (StaticData.ALL_EXTENSION.contains(extName)) {
+                    list.add(f);
+                }
+            }
+        }
     }
 
     /**
@@ -255,11 +290,11 @@
 
             String fileName = FileHelper.getFileName(f.getPath());
             String extName = FileHelper.getExtension(fileName);
-            if (!StaticData.ALL_EXTENSION.contains(extName)) {
+            if (!StaticData.ALL_EXTENSION.contains(extName) || fileName.startsWith("~")) {
                 continue;
             }
 
-            int dirid = getDirByPath(f.getPath(), dir, dirs);
+            int dirid = getDirByPath(f.getPath(), fileName, dir, dirs);
             boolean isShp = StaticData.SHP.equals(extName);
             if (isGdb) {
                 List<MetaFileEntity> rs = getGdbMappers(f, meta, dirid, start);
@@ -278,7 +313,7 @@
 
             if (isShp) {
                 List<String> shpFiles = getShpFiles(f.getPath());
-                mf.setTab(fileName);
+                mf.setTab(fileName.replace(StaticData.SHP, ""));
                 mf.setSizes(getFilesSize(shpFiles));
                 mf.setGuid(getFilesMd5(shpFiles));
             } else {
@@ -308,16 +343,16 @@
     /**
      * 鏍规嵁鏂囦欢璺緞鑾峰彇鐩綍ID
      */
-    private int getDirByPath(String filePath, DirEntity dir, List<DirEntity> dirs) {
+    private int getDirByPath(String filePath,String fileName, DirEntity dir, List<DirEntity> dirs) {
         if (0 != dir.getPid() || null == dirs || dirs.isEmpty()) {
             return dir.getId();
         }
-        if ("/".equals(File.separator)) {
+        if (StaticData.SLASH.equals(File.separator)) {
             filePath = filePath.replace("/", "\\");
         }
 
         for (DirEntity entity : dirs) {
-            if (filePath.contains(entity.getFullName())) {
+            if (filePath.contains(entity.getFullName() + "\\" + fileName)) {
                 return entity.getId();
             }
         }
@@ -332,8 +367,8 @@
         List<String> list = new ArrayList<>();
         list.add(shpPath);
 
-        for (int i = 1, c = StaticData.SHP_EXTENSION.size(); i < c; i++) {
-            String path = shpPath.replace(".shp", StaticData.SHP_EXTENSION.get(i));
+        for (int i = 0, c = StaticData.SHP_EXT.size(); i < c; i++) {
+            String path = shpPath.replace(".shp", StaticData.SHP_EXT.get(i));
 
             File f = new File(path);
             if (f.exists() && !f.isDirectory()) {
@@ -451,6 +486,17 @@
     }
 
     /**
+     * 璁剧疆鍏冩暟鎹枃浠剁殑绫诲瀷
+     */
+    private void setMetaType(List<MetaFileEntity> list) {
+        for (MetaFileEntity mf : list) {
+            if (null != mf.getExtName()) {
+                mf.setType(mf.getExtName().replace(".", ""));
+            }
+        }
+    }
+
+    /**
      * 鑾峰彇鍙傛暟 *
      * Enumeration<String> headers = req.getHeaderNames();
      * Enumeration<String> attributes = req.getAttributeNames();

--
Gitblit v1.9.3