From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/service/all/BaseUploadService.java |   98 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 82 insertions(+), 16 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 2290e01..eb21b50 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -7,6 +7,7 @@
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.*;
 import com.lf.server.service.data.DirService;
+import com.lf.server.service.sys.TokenService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,7 @@
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -27,11 +29,14 @@
  */
 @Service
 public class BaseUploadService {
-    @Autowired
+    @Resource
     protected DirService dirService;
 
-    @Autowired
+    @Resource
     protected PathHelper pathHelper;
+
+    @Resource
+    protected TokenService tokenService;
 
     public final Log log = LogFactory.getLog(getClass());
 
@@ -526,7 +531,7 @@
     /**
      * 鑾峰彇OSGB鏂囦欢鏄犲皠
      */
-    private MetaFileEntity getOsgbMapper(File f,  MetaFileEntity meta, int start) {
+    private MetaFileEntity getOsgbMapper(File f, MetaFileEntity meta, int start) {
         String fileName = FileHelper.getFileName(f.getPath());
 
         List<String> files = new ArrayList<>();
@@ -552,28 +557,89 @@
      */
     private void setDircode(List<MetaFileEntity> list, DirEntity dir) {
         List<DirEntity> dirs = dirService.selectRecursiveById(dir.getId());
-        if (null == dirs || dirs.isEmpty()) {
-            for (MetaFileEntity mfe : list) {
-                mfe.setDircode(dir.getCode());
-            }
-            return;
-        }
-
         for (MetaFileEntity mfe : list) {
-            String code= dir.getCode();
+            String filePath = mfe.getPath().toLowerCase().replace("/", "\\");
             String fileName = mfe.getName().toLowerCase();
-            String filePath = mfe.getPath().replace("/", "\\").toLowerCase();
-            for(DirEntity de : dirs){
-                if (filePath.contains(de.getFullName().toLowerCase() + "\\" + fileName)) {
-                    code=de.getCode();
-                    break;
+
+            String code = findDirByPath(dirs, filePath, fileName);
+            if (StringHelper.isEmpty(code)) {
+                DirEntity baseDir = findBaseDirByPath(dirs, filePath);
+                if (null != baseDir) {
+                    createDirByPath(baseDir, mfe.getPath().replace("/", "\\"));
+                    dirs = dirService.selectRecursiveById(dir.getId());
+                    code = findDirByPath(dirs, filePath, fileName);
                 }
             }
+            code = StringHelper.isEmpty(code) ? dir.getCode() : code;
             mfe.setDircode(code);
         }
     }
 
     /**
+     * 鏍规嵁璺緞鏌ユ壘鐩綍
+     */
+    private String findDirByPath(List<DirEntity> dirs, String filePath,String fileName) {
+        for (DirEntity de : dirs) {
+            if (filePath.contains(de.getFullName().toLowerCase() + "\\" + fileName)) {
+                return de.getCode();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 鏍规嵁璺緞鏌ユ壘鐖剁洰褰�
+     */
+    private DirEntity findBaseDirByPath(List<DirEntity> dirs, String filePath) {
+        for (DirEntity de : dirs) {
+            if (StringHelper.isEmpty(de.getCode()) || de.getCode().length() != StaticData.FOUR) {
+                continue;
+            }
+            if (filePath.contains(de.getFullName().toLowerCase() + "\\")) {
+                return de;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 鏍规嵁璺緞鍒涘缓鐩綍
+     */
+    private void createDirByPath(DirEntity baseDir, String filePath) {
+        int start = filePath.toLowerCase().indexOf(baseDir.getFullName().toLowerCase() + "\\") + baseDir.getFullName().length() + 1;
+        int end = filePath.lastIndexOf("\\");
+        if (end <= start) {
+            return;
+        }
+        if (0 == baseDir.getLevel()) {
+            baseDir.setLevel(2);
+        }
+
+        HttpServletRequest req = WebHelper.getRequest();
+        UserEntity ue = tokenService.getCurrentUser(req);
+
+        String[] strs = filePath.substring(start, end).split("\\\\");
+        for (String str : strs) {
+            DirEntity entity = dirService.selectDirByName(str, baseDir.getId());
+            if (null == entity) {
+                entity = new DirEntity();
+                entity.setPid(baseDir.getId());
+                entity.setName(str);
+                entity.setOrderNum(dirService.selectMaxOrderNum());
+                entity.setLevel(baseDir.getLevel() + 1);
+                entity.setCreateUser(ue.getId());
+
+                dirService.insert(entity);
+                baseDir = dirService.selectDir(entity.getId());
+            } else {
+                baseDir = entity;
+            }
+        }
+    }
+
+    /**
      * 鑾峰彇鍙傛暟 *
      * Enumeration<String> headers = req.getHeaderNames();
      * Enumeration<String> attributes = req.getAttributeNames();

--
Gitblit v1.9.3