lanyuanxiaoyao/spring-boot-service-template
1
0
Fork 0
Code Activity

perf: 优化in查询对应的参数名，in会和kotlin的关键字同名

Browse Source
This commit is contained in:
兰缘小妖
2025-08-21 10:46:12 +08:00
parent 8244b5dbdf
commit 280eeea6f7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lanyuanxiaoyao/service/template/controller/Query.java
View File

@@ -141,11 +141,11 @@ public class Query {
/**
* 指定字段值在指定范围内的条件映射（字段名 -> 值列表）
*/
private Map<String, List<Object>> in;
private Map<String, List<Object>> inside;
/**
* 指定字段值不在指定范围内的条件映射（字段名 -> 值列表）
*/
private Map<String, List<Object>> notIn;
private Map<String, List<Object>> notInside;
/**
* 指定字段值在指定区间内的条件映射（字段名 -> 区间范围）
*/

8
src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java
View File

@@ -316,11 +316,11 @@ public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implemen
predicates.add(builder.lessThanOrEqualTo(path, (Comparable<Object>) value));
});
}
if (ObjectHelper.isNotEmpty(queryable.getIn())) {
queryable.getIn().forEach((column, value) -> predicates.add(builder.in(column(root, column)).value(value)));
if (ObjectHelper.isNotEmpty(queryable.getInside())) {
queryable.getInside().forEach((column, value) -> predicates.add(builder.in(column(root, column)).value(value)));
}
if (ObjectHelper.isNotEmpty(queryable.getNotIn())) {
queryable.getNotIn().forEach((column, value) -> predicates.add(builder.in(column(root, column)).value(value).not()));
if (ObjectHelper.isNotEmpty(queryable.getNotInside())) {
queryable.getNotInside().forEach((column, value) -> predicates.add(builder.in(column(root, column)).value(value).not()));
}
if (ObjectHelper.isNotEmpty(queryable.getBetween())) {
queryable.getBetween().forEach((column, value) -> {