From b89d56282fc88075f103de4ed38a65b25b54de60 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 25 六月 2023 17:47:15 +0800
Subject: [PATCH] 解决资料馆的多项目+多类型查询时过滤数据不准确
---
src/main/java/com/lf/server/service/show/DataLibService.java | 74 +++++++++++++++++++++++++++---------
data/db_cx.sql | 2
2 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 27c57d5..bfeb93d 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -64,7 +64,7 @@
select id, pid, type, cn_name, en_name, url, serve_type, data_type, elev, pubid, is_project, bak
from lf.sys_layer where serve_type = 'WMS' order by id;
select id,uid,uname,pwd from lf.sys_user order by uid;
-
+select * from lf.sys_meta where type='osgb' order by id desc limit 20;
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 8ef4765..cb9c738 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -285,7 +285,7 @@
}
List<String> list = codesAsList(codes);
- removeDuplicate(list);
+ list = copeDirCodes(list);
setRightLike(list, field);
return "(" + StringHelper.join(list, " or ") + ")";
@@ -305,39 +305,75 @@
}
/**
- * 鍘婚櫎閲嶅
+ * 澶勭悊鐩綍缂栫爜
*/
- private static void removeDuplicate(List<String> list) {
- int i = 0;
- while (i < list.size()) {
- int j = findStr(list, i);
- if (j > -1) {
- list.remove(j);
- continue;
- }
-
- i++;
+ private static List<String> copeDirCodes(List<String> list) {
+ List<String> prjList = getDirCodesByLen(list, 0, 2);
+ List<String> appList = getDirCodesByLen(list, 3, 30);
+ if (prjList.isEmpty() && appList.isEmpty()) {
+ return list;
}
+ if (prjList.isEmpty()) {
+ return appList;
+ }
+ if (appList.isEmpty()) {
+ return prjList;
+ }
+
+ return filterCodes(prjList, appList);
}
/**
- * 鏌ユ壘瀛楃涓�
+ * 鏍规嵁闀垮害鑾峰彇鍗曚綅缂栫爜
*/
- private static int findStr(List<String> list, int i) {
- String source = list.get(i);
- for (int j = i + 1, c = list.size(); j < c; j++) {
- if (list.get(j).startsWith(source)) {
- return j;
+ private static List<String> getDirCodesByLen(List<String> list, int start, int end) {
+ List<String> rs = new ArrayList<>();
+ for (String code : list) {
+ if (StringHelper.isEmpty(code)) {
+ continue;
+ }
+
+ if (code.length() >= start && code.length() <= end) {
+ rs.add(code);
}
}
- return -1;
+ return rs;
+ }
+
+ /**
+ * 杩囨护椤圭洰缂栫爜
+ */
+ private static List<String> filterCodes(List<String> prjList, List<String> appList) {
+ int i = 0;
+ while (i < appList.size()) {
+ boolean flag = false;
+ for (String prj : prjList) {
+ if (appList.get(i).startsWith(prj)) {
+ flag = true;
+ break;
+ }
+ }
+
+ if (!flag) {
+ appList.remove(i);
+ continue;
+ }
+ i++;
+ }
+
+ return appList;
}
/**
* 璁剧疆 鍙砽ike
*/
private static void setRightLike(List<String> list, String field) {
+ if (list.isEmpty()) {
+ list.add("1 = 2");
+ return;
+ }
+
for (int i = 0, c = list.size(); i < c; i++) {
String str = String.format("%s like '%s%%'", field, list.get(i));
list.set(i, str);
--
Gitblit v1.9.3