diff --git a/src/main/java/org/redkale/source/FilterExpress.java b/src/main/java/org/redkale/source/FilterExpress.java index 2be931d65..fd347573f 100644 --- a/src/main/java/org/redkale/source/FilterExpress.java +++ b/src/main/java/org/redkale/source/FilterExpress.java @@ -17,8 +17,8 @@ public enum FilterExpress { EQ("="), IG_EQ("="),//不区分大小写的 = - NOT_EQ("<>"), // - IG_NOT_EQ("="),//不区分大小写的 <> + NE("<>"), // + IG_NE("="),//不区分大小写的 <> GT(">"), LT("<"), GE(">="), diff --git a/src/main/java/org/redkale/source/FilterNode.java b/src/main/java/org/redkale/source/FilterNode.java index d98e202dc..6b6f61329 100644 --- a/src/main/java/org/redkale/source/FilterNode.java +++ b/src/main/java/org/redkale/source/FilterNode.java @@ -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 FilterNode notEq(LambdaSupplier func) { - return and(new FilterNode(LambdaSupplier.readColumn(func), NOT_EQ, func.get())); + return and(new FilterNode(LambdaSupplier.readColumn(func), NE, func.get())); } public FilterNode notEq(LambdaFunction 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 FilterNode igNotEq(LambdaSupplier 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 FilterNode igNotEq(LambdaFunction 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() { @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() { @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() { @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() { @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('\''); diff --git a/src/main/java/org/redkale/source/FilterNodeBean.java b/src/main/java/org/redkale/source/FilterNodeBean.java index 9c4cbb23d..03c0d9f13 100644 --- a/src/main/java/org/redkale/source/FilterNodeBean.java +++ b/src/main/java/org/redkale/source/FilterNodeBean.java @@ -427,7 +427,7 @@ public final class FilterNodeBean implements Comparable FilterNode notEq(LambdaSupplier func) { - return new FilterNode(LambdaSupplier.readColumn(func), NOT_EQ, func.get()); + public static FilterNode ne(LambdaSupplier func) { + return new FilterNode(LambdaSupplier.readColumn(func), NE, func.get()); } - public static FilterNode notEq(LambdaFunction func, F value) { - return new FilterNode(LambdaFunction.readColumn(func), NOT_EQ, value); + public static FilterNode ne(LambdaFunction 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 FilterNode igNotEq(LambdaSupplier func) { - return new FilterNode(LambdaSupplier.readColumn(func), IG_NOT_EQ, func.get()); + public static FilterNode igNe(LambdaSupplier func) { + return new FilterNode(LambdaSupplier.readColumn(func), IG_NE, func.get()); } - public static FilterNode igNotEq(LambdaFunction func, F value) { - return new FilterNode(LambdaFunction.readColumn(func), IG_NOT_EQ, value); + public static FilterNode igNe(LambdaFunction 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: