mp工具类

sd-framework/src/main/java/com/sd/framework/util/sql/From.java

@@ -26,7 +26,7 @@ public class From<T> extends Where<T> {
 
     public <K, V> From<T> leftJoin(String as1, Class<K> cls1, SFunction<K, ?> on1, String as2, SFunction<V, ?> on2) {
         sql.fromList.add(" LEFT JOIN " + FieldUtil.getTableName(cls1) + " " + as1 + " ON " +
-                FieldUtil.getSqlFieldName(as1, on1) + " = " + FieldUtil.getSqlFieldName(as2, on2));
+                sql.getSqlFieldName(as1, on1) + " = " + sql.getSqlFieldName(as2, on2));
         return this;
     }
 
@@ -44,7 +44,7 @@ public class From<T> extends Where<T> {
 
     public <K, V> From<T> rightJoin(String as1, Class<K> cls1, SFunction<K, ?> on1, String as2, SFunction<V, ?> on2) {
         sql.fromList.add(" RIGHT JOIN " + FieldUtil.getTableName(cls1) + " " + as1 + " ON " +
-                FieldUtil.getSqlFieldName(as1, on1) + " = " + FieldUtil.getSqlFieldName(as2, on2));
+                sql.getSqlFieldName(as1, on1) + " = " + sql.getSqlFieldName(as2, on2));
         return this;
     }
 
@@ -62,7 +62,7 @@ public class From<T> extends Where<T> {
 
     public <K, V> From<T> innerJoin(String as1, Class<K> cls1, SFunction<K, ?> on1, String as2, SFunction<V, ?> on2) {
         sql.fromList.add(" INNER JOIN " + FieldUtil.getTableName(cls1) + " " + as1 + " ON " +
-                FieldUtil.getSqlFieldName(as1, on1) + " = " + FieldUtil.getSqlFieldName(as2, on2));
+                sql.getSqlFieldName(as1, on1) + " = " + sql.getSqlFieldName(as2, on2));
         return this;
     }
 

sd-framework/src/main/java/com/sd/framework/util/sql/Select.java

@@ -62,49 +62,49 @@ public class Select<T> {
 
     public <S, V> Select<T> max(SFunction<S, V> function, SFunction<T, ?> asFunction) {
         String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
-        sql.fieldList.add("MAX(" + sql.getSqlFieldName(function) + ")" + StringPool.SPACE + as);
+        sql.fieldList.add("MAX(" + sql.getSqlFieldName(function) + ") " + as);
         return this;
     }
 
     public <S, V> Select<T> max(String alias, SFunction<S, V> function, SFunction<T, ?> asFunction) {
         String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
-        sql.fieldList.add("MAX(" + sql.getSqlFieldName(alias, function) + ")" + StringPool.SPACE + as);
+        sql.fieldList.add("MAX(" + sql.getSqlFieldName(alias, function) + ") " + as);
         return this;
     }
 
     public <S, V> Select<T> min(SFunction<S, V> function, SFunction<T, ?> asFunction) {
         String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
-        sql.fieldList.add("MIN(" + sql.getSqlFieldName(function) + ")" + StringPool.SPACE + as);
+        sql.fieldList.add("MIN(" + sql.getSqlFieldName(function) + ") " + as);
         return this;
     }
 
     public <S, V> Select<T> min(String alias, SFunction<S, V> function, SFunction<T, ?> asFunction) {
         String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
-        sql.fieldList.add("MIN(" + sql.getSqlFieldName(alias, function) + ")" + StringPool.SPACE + as);
+        sql.fieldList.add("MIN(" + sql.getSqlFieldName(alias, function) + ") " + as);
         return this;
     }
 
     public <S, V> Select<T> count(SFunction<S, V> function, SFunction<T, ?> asFunction) {
         String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
-        sql.fieldList.add("COUNT(" + sql.getSqlFieldName(function) + ")" + StringPool.SPACE + as);
+        sql.fieldList.add("COUNT(" + sql.getSqlFieldName(function) + ") " + as);
         return this;
     }
 
     public <S, V> Select<T> count(String alias, SFunction<S, V> function, SFunction<T, ?> asFunction) {
         String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
-        sql.fieldList.add("COUNT(" + sql.getSqlFieldName(alias, function) + ")" + StringPool.SPACE + as);
+        sql.fieldList.add("COUNT(" + sql.getSqlFieldName(alias, function) + ") " + as);
         return this;
     }
 
     public <S, V> Select<T> sum(SFunction<S, V> function, SFunction<T, ?> asFunction) {
         String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
-        sql.fieldList.add("SUM(" + sql.getSqlFieldName(function) + ")" + StringPool.SPACE + as);
+        sql.fieldList.add("SUM(" + sql.getSqlFieldName(function) + ") " + as);
         return this;
     }
 
     public <S, V> Select<T> sum(String alias, SFunction<S, V> function, SFunction<T, ?> asFunction) {
         String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
-        sql.fieldList.add("SUM(" + sql.getSqlFieldName(alias, function) + ")" + StringPool.SPACE + as);
+        sql.fieldList.add("SUM(" + sql.getSqlFieldName(alias, function) + ") " + as);
         return this;
     }
 

sd-framework/src/main/java/com/sd/framework/util/sql/Where.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
 import com.baomidou.mybatisplus.core.conditions.SharedString;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
@@ -307,8 +306,4 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
         return BeanUtil.copyProperties(one, sql.resultCls);
     }
 
-    public String getSql() {
-        return sql.getSql() + StringPool.SPACE + getCustomSqlSegment();
-    }
-
 }