zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 优化通用查询注解解析器

Browse Source
This commit is contained in:
Charles7c 2023-03-31 21:31:07 +08:00
parent 9f25925d46
commit a623acd4a5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java
View File

@ -142,7 +142,8 @@ public class QueryHelper {
String property = queryAnnotation.property(); String property = queryAnnotation.property();
fieldName = StrUtil.blankToDefault(property, fieldName); fieldName = StrUtil.blankToDefault(property, fieldName);
String columnName = StrUtil.toUnderlineCase(fieldName); String columnName = StrUtil.toUnderlineCase(fieldName);
switch (queryAnnotation.type()) { Query.Type queryType = queryAnnotation.type();
switch (queryType) {
case EQUAL: case EQUAL:
queryWrapper.eq(columnName, fieldValue); queryWrapper.eq(columnName, fieldValue);
break; break;
@ -163,7 +164,9 @@ public class QueryHelper {
break; break;
case BETWEEN: case BETWEEN:
List<Object> between = new ArrayList<>((List<Object>)fieldValue); List<Object> between = new ArrayList<>((List<Object>)fieldValue);
if (between.size() >= 2) {
queryWrapper.between(columnName, between.get(0), between.get(1)); queryWrapper.between(columnName, between.get(0), between.get(1));
}
break; break;
case LEFT_LIKE: case LEFT_LIKE:
queryWrapper.likeLeft(columnName, fieldValue); queryWrapper.likeLeft(columnName, fieldValue);
@ -191,7 +194,7 @@ public class QueryHelper {
queryWrapper.isNotNull(columnName); queryWrapper.isNotNull(columnName);
break; break;
default: default:
break; throw new IllegalArgumentException(String.format("暂不支持 [%s] 查询类型", queryType));
} }
} }
} }