From e79ff5dbf7c725ee815d7632f45573775b9679b3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 九月 2023 17:31:25 +0800
Subject: [PATCH] 支持or查询
---
src/main/java/com/moon/server/service/all/BaseQueryService.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moon/server/service/all/BaseQueryService.java b/src/main/java/com/moon/server/service/all/BaseQueryService.java
index 8a3d016..41d19ad 100644
--- a/src/main/java/com/moon/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/moon/server/service/all/BaseQueryService.java
@@ -37,20 +37,20 @@
/**
* 琛ㄥ悕Map
*/
- private static Map<String, String> tabMap = new HashMap<>(3);
+ private static final Map<String, String> TAB_MAP = new HashMap<>(3);
/**
- * 娣诲姞杩囨护鏉′欢
+ * 娣诲姞杩囨护鏉′欢锛�(?i)and
*
* @param wrapper QueryWrapper
* @param filter 鍘熷杩囨护鏉′欢瀛楃涓�
*/
- public void addFilterWrapper(QueryWrapper wrapper, String filter) {
+ public <T> void addFilterWrapper(QueryWrapper<T> wrapper, String filter) {
if (StringHelper.isEmpty(filter)) {
return;
}
- String[] strs = filter.trim().split(" (?i)and ");
+ String[] strs = filter.trim().split(" and | or ");
for (String str : strs) {
int start = str.indexOf(" ");
if (start == -1) {
@@ -64,6 +64,12 @@
String field = convertFiled(str.substring(0, start).trim());
String express = str.substring(start + 1, end).trim().toLowerCase();
String value = str.substring(end + 1).trim();
+
+ start = filter.indexOf(str) - StaticData.I4;
+ end = filter.indexOf(" or ", start);
+ if (start == end && start > -1) {
+ wrapper = wrapper.or();
+ }
addWrapper(wrapper, field, express, getObjectVal(express, value));
}
@@ -79,7 +85,7 @@
if (Character.isUpperCase(ch)) {
sb.append('_');
sb.append(Character.toLowerCase(ch));
- }else {
+ } else {
sb.append(ch);
}
}
@@ -115,7 +121,7 @@
* @param express 琛ㄨ揪寮�
* @param val 鍊�
*/
- private void addWrapper(QueryWrapper wrapper, String field, String express, Object val) {
+ private <T> void addWrapper(QueryWrapper<T> wrapper, String field, String express, Object val) {
if (StringHelper.isDate(val.toString())) {
wrapper.apply(String.format("%s %s '%s'", field, express, val));
return;
@@ -224,8 +230,8 @@
*/
public static String getTabName(BasicMapper basicMapper) {
String className = ClassHelper.getClassName(basicMapper);
- if (tabMap.containsKey(className)) {
- return tabMap.get(className);
+ if (TAB_MAP.containsKey(className)) {
+ return TAB_MAP.get(className);
}
return getTabName(className);
@@ -246,8 +252,8 @@
TableName annotation = (TableName) clazz.getAnnotation(TableName.class);
String tabName = annotation.value();
- if (tabName != null && !tabMap.containsKey(className)) {
- tabMap.put(className, tabName);
+ if (tabName != null && !TAB_MAP.containsKey(className)) {
+ TAB_MAP.put(className, tabName);
}
return tabName;
--
Gitblit v1.9.3