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/show/DataLibService.java |   64 +++++++++++++++++++++++++++----
 1 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index cb9c738..5abe6ac 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lf.server.entity.ctrl.DownloadReqEntity;
+import com.lf.server.entity.ctrl.KeyValueEntity;
 import com.lf.server.entity.data.DownloadEntity;
 import com.lf.server.entity.sys.AttachEntity;
 import com.lf.server.entity.sys.UserEntity;
@@ -17,6 +18,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.io.File;
 import java.util.*;
@@ -26,6 +28,7 @@
  * @author WWW
  */
 @Service
+@SuppressWarnings("ALL")
 public class DataLibService {
     @Autowired
     PathHelper pathHelper;
@@ -284,15 +287,23 @@
             return null;
         }
 
-        List<String> list = codesAsList(codes);
-        list = copeDirCodes(list);
-        setRightLike(list, field);
+        //List<String> list = Arrays.asList(codes.split(","));
+        //List<String> list = codesAsList(codes);
+        //list = copeDirCodes(list);
+        //setRightLike(list, field);
 
-        return "(" + StringHelper.join(list, " or ") + ")";
+        //return "(" + StringHelper.join(list, " or ") + ")";
+
+        List<String> list = new ArrayList<>();
+        for (String dir : codes.split(",")) {
+            list.add("^" + dir);
+        }
+
+        return field + " ~ '" + StringHelper.join(list, "|") + "'";
     }
 
     /**
-     * 鍗曚綅缂栫爜杞泦鍚�
+     * 鍗曚綅缂栫爜杞泦鍚� *
      */
     private static List<String> codesAsList(String codes) {
         List<String> list = Arrays.asList(codes.split(","));
@@ -305,7 +316,7 @@
     }
 
     /**
-     * 澶勭悊鐩綍缂栫爜
+     * 澶勭悊鐩綍缂栫爜 *
      */
     private static List<String> copeDirCodes(List<String> list) {
         List<String> prjList = getDirCodesByLen(list, 0, 2);
@@ -324,7 +335,7 @@
     }
 
     /**
-     * 鏍规嵁闀垮害鑾峰彇鍗曚綅缂栫爜
+     * 鏍规嵁闀垮害鑾峰彇鍗曚綅缂栫爜 *
      */
     private static List<String> getDirCodesByLen(List<String> list, int start, int end) {
         List<String> rs = new ArrayList<>();
@@ -342,7 +353,7 @@
     }
 
     /**
-     * 杩囨护椤圭洰缂栫爜
+     * 杩囨护椤圭洰缂栫爜 *
      */
     private static List<String> filterCodes(List<String> prjList, List<String> appList) {
         int i = 0;
@@ -366,7 +377,7 @@
     }
 
     /**
-     * 璁剧疆 鍙砽ike
+     * 璁剧疆 鍙砽ike *
      */
     private static void setRightLike(List<String> list, String field) {
         if (list.isEmpty()) {
@@ -379,4 +390,39 @@
             list.set(i, str);
         }
     }
+
+    /**
+     * 鏍规嵁璧勬枡绫诲埆鑾峰彇鐩綍缂栫爜
+     */
+    public String getDirsByTypes(String types, String dirs, String field) {
+        if (StringUtils.isEmpty(types) && StringUtils.isEmpty(dirs)) {
+            return null;
+        }
+
+        if (!StringUtils.isEmpty(types)) {
+            List<KeyValueEntity> list = baseQueryService.selectDirsByTypes(types.split(","), copeCodes(dirs, "code"));
+            if (null == list || list.isEmpty()) {
+                return "1 = 2";
+            }
+
+            return copeDirs(list, field);
+        }
+
+        return copeCodes(dirs, field);
+    }
+
+    /**
+     * 澶勭悊鐩綍缂栫爜锛歞ircode ~ '^0A|^0E'
+     */
+    public static String copeDirs(List<KeyValueEntity> kvs, String field) {
+        List<String> list = new ArrayList<>();
+        for (KeyValueEntity kv : kvs) {
+            String[] dirs = kv.getValue().split(",");
+            for (String dir : dirs) {
+                list.add("^" + dir);
+            }
+        }
+
+        return field + " ~ '" + StringHelper.join(list, "|") + "'";
+    }
 }

--
Gitblit v1.9.3