lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

变更ne方法

Browse Source
This commit is contained in:
redkale
2023-12-01 16:15:53 +08:00
parent c234663f87
commit 0085493b3f
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/redkale/source/FilterExpress.java
View File

@@ -17,8 +17,8 @@ public enum FilterExpress {
EQ("="),
IG_EQ("="),//不区分大小写的 =
NOT_EQ("<>"), //
IG_NOT_EQ("="),//不区分大小写的 <>
NE("<>"), //
IG_NE("="),//不区分大小写的 <>
GT(">"),
LT("<"),
GE(">="),

24
src/main/java/org/redkale/source/FilterNode.java
View File

@@ -302,27 +302,27 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
}
public FilterNode notEq(String column, Serializable value) {
return and(new FilterNode(column, NOT_EQ, value));
return and(new FilterNode(column, NE, value));
}
public <F extends Serializable> FilterNode notEq(LambdaSupplier<F> func) {
return and(new FilterNode(LambdaSupplier.readColumn(func), NOT_EQ, func.get()));
return and(new FilterNode(LambdaSupplier.readColumn(func), NE, func.get()));
}
public <T, F extends Serializable> FilterNode notEq(LambdaFunction<T, F> func, F value) {
return and(new FilterNode(LambdaFunction.readColumn(func), NOT_EQ, value));
return and(new FilterNode(LambdaFunction.readColumn(func), NE, value));
}
public FilterNode igNotEq(String column, Serializable value) {
return and(new FilterNode(column, IG_NOT_EQ, value));
return and(new FilterNode(column, IG_NE, value));
}
public <F extends Serializable> FilterNode igNotEq(LambdaSupplier<F> func) {
return and(new FilterNode(LambdaSupplier.readColumn(func), IG_NOT_EQ, func.get()));
return and(new FilterNode(LambdaSupplier.readColumn(func), IG_NE, func.get()));
}
public <T, F extends Serializable> FilterNode igNotEq(LambdaFunction<T, F> func, F value) {
return and(new FilterNode(LambdaFunction.readColumn(func), IG_NOT_EQ, value));
return and(new FilterNode(LambdaFunction.readColumn(func), IG_NE, value));
}
public FilterNode gt(String column, Number value) {
@@ -993,7 +993,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
if (express == LEN_EQ || express == LEN_LT || express == LEN_LE
|| express == LEN_GT || express == LEN_GE) {
sb.append("LENGTH(").append(info.getSQLColumn(talis, column)).append(')');
} else if (express == IG_EQ || express == IG_NOT_EQ || express == IG_LIKE || express == IG_NOT_LIKE) {
} else if (express == IG_EQ || express == IG_NE || express == IG_LIKE || express == IG_NOT_LIKE) {
sb.append("LOWER(").append(info.getSQLColumn(talis, column)).append(')');
if (fk) {
val = "LOWER(" + info.getSQLColumn(talis, ((FilterColValue) val0).getColumn()) + ')';
@@ -1440,7 +1440,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
return "LOWER(" + field + ") " + express.value() + ' ' + formatToString(val);
}
};
case NOT_EQ:
case NE:
return fk ? new Predicate<T>() {
@Override
@@ -1464,7 +1464,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
return field + ' ' + express.value() + ' ' + formatToString(val);
}
};
case IG_NOT_EQ:
case IG_NE:
return fk ? new Predicate<T>() {
@Override
@@ -1613,7 +1613,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
return field + " " + express.value() + " " + fv0.getLeft() + " " + fv0.getExpress().value() + " " + fv0.getRight();
}
};
case NOT_EQ:
case NE:
return new Predicate<T>() {
@Override
@@ -1697,7 +1697,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
return field + " " + express.value() + " " + fv1.getLeft() + " " + fv1.getExpress().value() + " " + fv1.getRight();
}
};
case NOT_EQ:
case NE:
return new Predicate<T>() {
@Override
@@ -2604,7 +2604,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} else if (express == IG_LIKE || express == IG_NOT_LIKE) {
value = "%" + value.toString().toLowerCase() + '%';
} else if (express == IG_CONTAIN || express == IG_NOT_CONTAIN
|| express == IG_EQ || express == IG_NOT_EQ) {
|| express == IG_EQ || express == IG_NE) {
value = value.toString().toLowerCase();
}
return new StringBuilder().append('\'').append(value.toString().replace("'", "\\'")).append('\'');

2
src/main/java/org/redkale/source/FilterNodeBean.java
View File

@@ -427,7 +427,7 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
|| express == LEN_GT || express == LEN_GE) {
sb.append("LENGTH(").append(col).append(") ").append(express.value()).append(" ?");
} else {
boolean lower = (express == IG_EQ || express == IG_NOT_EQ || express == IG_LIKE
boolean lower = (express == IG_EQ || express == IG_NE || express == IG_LIKE
|| express == IG_NOT_LIKE || express == IG_CONTAIN || express == IG_NOT_CONTAIN);
sb.append(lower ? ("LOWER(" + col + ')') : col).append(' ').append(express.value()).append(" ?");
}

28
src/main/java/org/redkale/source/FilterNodes.java
View File

@@ -71,28 +71,28 @@ public final class FilterNodes {
return new FilterNode(LambdaFunction.readColumn(func), IG_EQ, value);
}
public static FilterNode notEq(String column, Serializable value) {
return new FilterNode(column, NOT_EQ, value);
public static FilterNode ne(String column, Serializable value) {
return new FilterNode(column, NE, value);
}
public static <F extends Serializable> FilterNode notEq(LambdaSupplier<F> func) {
return new FilterNode(LambdaSupplier.readColumn(func), NOT_EQ, func.get());
public static <F extends Serializable> FilterNode ne(LambdaSupplier<F> func) {
return new FilterNode(LambdaSupplier.readColumn(func), NE, func.get());
}
public static <T, F extends Serializable> FilterNode notEq(LambdaFunction<T, F> func, F value) {
return new FilterNode(LambdaFunction.readColumn(func), NOT_EQ, value);
public static <T, F extends Serializable> FilterNode ne(LambdaFunction<T, F> func, F value) {
return new FilterNode(LambdaFunction.readColumn(func), NE, value);
}
public static FilterNode igNotEq(String column, Serializable value) {
return new FilterNode(column, IG_NOT_EQ, value);
public static FilterNode igNe(String column, Serializable value) {
return new FilterNode(column, IG_NE, value);
}
public static <F extends Serializable> FilterNode igNotEq(LambdaSupplier<F> func) {
return new FilterNode(LambdaSupplier.readColumn(func), IG_NOT_EQ, func.get());
public static <F extends Serializable> FilterNode igNe(LambdaSupplier<F> func) {
return new FilterNode(LambdaSupplier.readColumn(func), IG_NE, func.get());
}
public static <T, F extends Serializable> FilterNode igNotEq(LambdaFunction<T, F> func, F value) {
return new FilterNode(LambdaFunction.readColumn(func), IG_NOT_EQ, value);
public static <T, F extends Serializable> FilterNode igNe(LambdaFunction<T, F> func, F value) {
return new FilterNode(LambdaFunction.readColumn(func), IG_NE, value);
}
public static FilterNode gt(String column, Number value) {
@@ -528,9 +528,9 @@ public final class FilterNodes {
case IGNORECASEEQUAL:
return IG_EQ;
case NOTEQUAL:
return NOT_EQ;
return NE;
case IGNORECASENOTEQUAL:
return IG_NOT_EQ;
return IG_NE;
case GREATERTHAN:
return GT;
case LESSTHAN: