From cb9fbcd27a288d0c61d85fa13ff5fc8eb1f4deab Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 16:44:56 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/all/BaseUploadService.java |   31 ++++++++++++++++++++-----------
 1 files changed, 20 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 2d88ea8..b7c21c7 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -129,7 +129,7 @@
     /**
      * 鏌ヨ鏂囦欢
      */
-    public List<MetaFileEntity> selectFiles(String subPath, List<String> extList) {
+    public List<MetaFileEntity> selectFiles(String subPath) {
         String root = pathHelper.getConfig().getTempPath() + File.separator + subPath;
 
         File file = new File(root);
@@ -145,7 +145,7 @@
         for (File f : files) {
             String fileName = FileHelper.getFileName(f.getPath());
             String extName = FileHelper.getExtension(fileName);
-            if (null != extList && !extList.contains(extName)) {
+            if (!isExtValid(extName)) {
                 continue;
             }
 
@@ -190,13 +190,13 @@
      * 鏌ヨ鏄犲皠
      */
     public List<MetaFileEntity> selectMappers(UserEntity ue, String path, DirEntity dir, VerEntity ver, String epsgCode) {
-        List<MetaFileEntity> metas = selectFiles(path, StaticData.ALL_EXTENSION);
+        List<MetaFileEntity> metas = selectFiles(path);
         if (null == metas || metas.isEmpty()) {
             return null;
         }
 
         List<MetaFileEntity> list = new ArrayList<>();
-        List<DirEntity> dirs = dirService.selectDirRecursive(dir.getName());
+        List<DirEntity> dirs = dirService.selectRecursiveById(dir.getId());
         for (MetaFileEntity meta : metas) {
             meta.setEventid(StringHelper.getGuid());
             meta.setDircode(dir.getCode());
@@ -252,7 +252,7 @@
         File file = new File(path);
         if (!file.isDirectory()) {
             String extName = FileHelper.getExtension(file);
-            if (StaticData.ALL_EXTENSION.contains(extName)) {
+            if (isExtValid(extName)) {
                 list.add(file);
             }
             return;
@@ -272,11 +272,18 @@
                 getFilesByPath(list, f.getPath());
             } else {
                 String extName = FileHelper.getExtension(f);
-                if (StaticData.ALL_EXTENSION.contains(extName)) {
+                if (isExtValid(extName)) {
                     list.add(f);
                 }
             }
         }
+    }
+
+    /**
+     * 鎵╁睍鏄惁鏈夋晥
+     */
+    private boolean isExtValid(String extName) {
+        return StaticData.ALL_EXTENSION.contains(extName) && !StaticData.MAPPER_EXCLUDE_EXT.contains(extName);
     }
 
     /**
@@ -292,7 +299,7 @@
 
             String fileName = FileHelper.getFileName(f.getPath());
             String extName = FileHelper.getExtension(fileName);
-            if (!StaticData.ALL_EXTENSION.contains(extName) || fileName.startsWith("~")) {
+            if (!isExtValid(extName) || fileName.startsWith("~")) {
                 continue;
             }
 
@@ -329,7 +336,7 @@
     }
 
     /**
-     * 鍒涘缓婧愭暟鎹枃浠跺疄浣撶被
+     * 鍒涘缓鍏冩暟鎹枃浠跺疄浣撶被
      */
     private MetaFileEntity createMetaFileEntity(MetaFileEntity meta) {
         MetaFileEntity mf = new MetaFileEntity();
@@ -353,8 +360,10 @@
             filePath = filePath.replace("/", "\\");
         }
 
+        fileName = fileName.toLowerCase();
+        filePath = filePath.toLowerCase();
         for (DirEntity entity : dirs) {
-            if (filePath.contains(entity.getFullName() + "\\" + fileName)) {
+            if (filePath.contains(entity.getFullName().toLowerCase() + "\\" + fileName)) {
                 return entity.getCode();
             }
         }
@@ -488,7 +497,7 @@
     }
 
     /**
-     * 璁剧疆婧愭暟鎹枃浠剁殑绫诲瀷
+     * 璁剧疆鍏冩暟鎹枃浠剁殑绫诲瀷
      */
     private void setMetaType(List<MetaFileEntity> list) {
         for (MetaFileEntity mf : list) {
@@ -514,7 +523,7 @@
      * Enumeration<String> attributes = req.getAttributeNames();
      */
     public Map<String, String> getParams(StandardMultipartHttpServletRequest req) {
-        Map<String, String> map = new HashMap<String, String>(3);
+        Map<String, String> map = new HashMap<>(3);
 
         Enumeration<String> enumeration = req.getParameterNames();
         while (enumeration.hasMoreElements()) {

--
Gitblit v1.9.3