mp工具类

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

@@ -1,5 +1,6 @@
 package com.sd.framework.util.sql;
 
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 
 
@@ -25,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 " + Sql.getTableName(cls1) + " " + as1 + " ON " +
+        sql.fromList.add(" LEFT JOIN " + Sql.getTableName(cls1) + StringPool.EMPTY + as1 + " ON " +
                 sql.getSqlFieldName(as1, on1) + " = " + sql.getSqlFieldName(as2, on2));
         return this;
     }
@@ -43,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 " + Sql.getTableName(cls1) + " " + as1 + " ON " +
+        sql.fromList.add(" RIGHT JOIN " + Sql.getTableName(cls1) + StringPool.EMPTY + as1 + " ON " +
                 sql.getSqlFieldName(as1, on1) + " = " + sql.getSqlFieldName(as2, on2));
         return this;
     }
@@ -61,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 " + Sql.getTableName(cls1) + " " + as1 + " ON " +
+        sql.fromList.add(" INNER JOIN " + Sql.getTableName(cls1) + StringPool.EMPTY + as1 + " ON " +
                 sql.getSqlFieldName(as1, on1) + " = " + sql.getSqlFieldName(as2, on2));
         return this;
     }

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

@@ -143,7 +143,7 @@ public class Select<T> {
 
     public From<T> from(String alias, Class<?> cls) {
         String tableName = Sql.getTableName(cls);
-        sql.fromList.add(" FROM " + tableName + " " + alias);
+        sql.fromList.add(" FROM " + tableName + StringPool.EMPTY + alias);
         return new From<>(sql);
     }
 

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

@@ -22,9 +22,10 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
         super.initNeed();
     }
 
-    private Where(Sql<T> sql, T entity, Class<T> entityClass, AtomicInteger paramNameSeq,
-                  Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments, SharedString paramAlias,
-                  SharedString lastSql, SharedString sqlComment, SharedString sqlFirst) {
+    protected Where(Sql<T> sql, T entity, Class<T> entityClass, AtomicInteger paramNameSeq,
+                    Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments, SharedString paramAlias,
+                    SharedString lastSql, SharedString sqlComment, SharedString sqlFirst) {
+        this.sql = sql;
         super.setEntity(entity);
         super.setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -34,7 +35,12 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
         this.lastSql = lastSql;
         this.sqlComment = sqlComment;
         this.sqlFirst = sqlFirst;
-        this.sql = sql;
+    }
+
+    @Override
+    protected Where<T> instance() {
+        return new Where<>(sql, getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs, new MergeSegments(),
+                paramAlias, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString());
     }
 
     /**
@@ -232,10 +238,6 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
         return in(sql.getSqlFieldName(alias, function), value);
     }
 
-    public Where<T> in(String sqlFieldName, Collection<?> value) {
-        return in(ObjectUtil.isNotEmpty(value), sqlFieldName, value);
-    }
-
     public <K, V> Where<T> in(SFunction<K, V> function, Object... value) {
         return in(sql.getSqlFieldName(function), value);
     }
@@ -244,6 +246,14 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
         return in(sql.getSqlFieldName(alias, function), value);
     }
 
+    public Where<T> in(String sqlFieldName, Collection<?> value) {
+        return in(ObjectUtil.isNotEmpty(value), sqlFieldName, value);
+    }
+
+    public Where<T> in(String sqlFieldName, Object... value) {
+        return in(ObjectUtil.isNotEmpty(value), sqlFieldName, value);
+    }
+
     /**
      * notIn
      */
@@ -255,10 +265,6 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
         return notIn(sql.getSqlFieldName(alias, function), value);
     }
 
-    public Where<T> notIn(String sqlFieldName, Collection<?> value) {
-        return notIn(ObjectUtil.isNotEmpty(value), sqlFieldName, value);
-    }
-
     public <K, V> Where<T> notIn(SFunction<K, V> function, Object... value) {
         return notIn(sql.getSqlFieldName(function), value);
     }
@@ -267,21 +273,24 @@ public class Where<T> extends AbstractWrapper<T, String, Where<T>> {
         return notIn(sql.getSqlFieldName(alias, function), value);
     }
 
+    public Where<T> notIn(String sqlFieldName, Collection<?> value) {
+        return notIn(ObjectUtil.isNotEmpty(value), sqlFieldName, value);
+    }
+
+    public Where<T> notIn(String sqlFieldName, Object... value) {
+        return notIn(ObjectUtil.isNotEmpty(value), sqlFieldName, value);
+    }
+
+
     /**
      * findInSet
      */
     public <K, V> Where<T> findInSet(SFunction<K, V> function, Object value) {
-        return apply(ObjectUtil.isNotEmpty(value), "find_in_set({0}, " + sql.getSqlFieldName(function) + ")", value);
+        return apply(ObjectUtil.isNotEmpty(value), "FIND_IN_SET({0}, " + sql.getSqlFieldName(function) + ")", value);
     }
 
     public <K, V> Where<T> findInSet(String alias, SFunction<K, V> function, Object value) {
-        return apply(ObjectUtil.isNotEmpty(value), "find_in_set({0}, " + sql.getSqlFieldName(alias, function) + ")", value);
-    }
-
-    @Override
-    protected Where<T> instance() {
-        return new Where<>(sql, getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs, new MergeSegments(),
-                paramAlias, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString());
+        return apply(ObjectUtil.isNotEmpty(value), "FIND_IN_SET({0}, " + sql.getSqlFieldName(alias, function) + ")", value);
     }
 
     public List<T> list() {