From f7b5d34d998461b78dbadf7fe03db257bc41a39f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 12 六月 2023 15:50:18 +0800
Subject: [PATCH] 添加 isTransform 参数

---
 src/main/java/com/lf/server/service/all/BaseUploadService.java |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 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 8e0fdb6..7f68fdc 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -45,7 +45,7 @@
     /**
      * 涓婁紶鏂囦欢
      */
-    public <T> List<MetaFileEntity> uploadData(T t, String path, HttpServletRequest req, HttpServletResponse res) throws Exception {
+    public <T> List<MetaFileEntity> uploadData(T t, String path, boolean isGetGuid, HttpServletRequest req, HttpServletResponse res) throws Exception {
         StandardMultipartHttpServletRequest request = (StandardMultipartHttpServletRequest) req;
         req.setCharacterEncoding("utf-8");
         res.setContentType("application/json;charset=utf-8");
@@ -54,7 +54,7 @@
             setEntity(t, request);
         }
 
-        return getFiles(path, request);
+        return getFiles(path, isGetGuid, request);
     }
 
     /**
@@ -97,7 +97,7 @@
     /**
      * 鑾峰彇鏂囦欢
      */
-    public List<MetaFileEntity> getFiles(String subPath, StandardMultipartHttpServletRequest req) throws Exception {
+    public List<MetaFileEntity> getFiles(String subPath, boolean isGetGuid, StandardMultipartHttpServletRequest req) throws Exception {
         List<MetaFileEntity> list = new ArrayList<>();
 
         String path = pathHelper.getTempPath(subPath);
@@ -116,7 +116,9 @@
             mf.setPath(path + File.separator + mf.getName());
 
             file.transferTo(new File(mf.getPath()));
-            mf.setGuid(FileHelper.getFileMd5(mf.getPath()));
+            if (isGetGuid) {
+                mf.setGuid(FileHelper.getFileMd5(mf.getPath()));
+            }
 
             list.add(mf);
         }
@@ -127,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);
@@ -143,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;
             }
 
@@ -188,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());
@@ -234,7 +236,8 @@
             zipFolder.mkdirs();
         }
 
-        String subPath = zipFolder + File.separator + meta.getName().toLowerCase().replace(".zip", "");
+        // String subPath = zipFolder + File.separator + meta.getName().toLowerCase().replace(".zip", "") .replace("锛�","").replace("锛�","").replace(" ","")
+        String subPath = zipFolder.getPath();
         ZipHelper.unzip(zipFile, subPath);
 
         List<File> files = new ArrayList<>();
@@ -250,7 +253,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;
@@ -270,11 +273,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);
     }
 
     /**
@@ -290,7 +300,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;
             }
 
@@ -351,8 +361,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();
             }
         }
@@ -512,7 +524,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