Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/baomidou/mybatisplus/core/metadata/MPJTableFieldInfo.java
#	src/main/java/com/github/yulichang/injector/MPJSqlInjector.java

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join</artifactId>
-    <version>1.1.8</version>
+    <version>1.2.0.Beta5</version>
     <name>mybatis-plus-join</name>
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
     <url>https://github.com/yulichang/mybatis-plus-join</url>
@@ -32,13 +32,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
+
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.4.3</version>
+            <version>3.4.3.2</version>
             <scope>provided</scope>
         </dependency>
 

src/main/java/com/baomidou/mybatisplus/core/metadata/MPJTableAliasHelper.java

@@ -0,0 +1,66 @@
+package com.baomidou.mybatisplus.core.metadata;
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.yulichang.annotation.MPJTableAlias;
+import com.github.yulichang.toolkit.Constant;
+import lombok.Data;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 全局表别名控制,默认表别名为 t t1 t2 ... <br>
+ * 可以通过@MPJTableAlias注解指定表别名<br/>
+ * 仅对MPJLambdaWrapper有效
+ *
+ * @author yulichang
+ * @see com.github.yulichang.wrapper.MPJLambdaWrapper
+ * @see MPJTableAlias
+ * @since 1.2.0
+ */
+public class MPJTableAliasHelper {
+
+    private static final Map<Class<?>, TableAlias> CACHE = new ConcurrentHashMap<>();
+
+    /**
+     * 用于生成别名的序号
+     */
+    private static final AtomicInteger index = new AtomicInteger(1);
+
+    public static void init(Class<?> clazz) {
+        TableAlias as = CACHE.get(clazz);
+        if (Objects.nonNull(as)) {
+            return;
+        }
+        TableAlias alias = new TableAlias();
+        MPJTableAlias tableAlias = clazz.getAnnotation(MPJTableAlias.class);
+        if (tableAlias != null && StringUtils.isNotBlank(tableAlias.value())) {
+            alias.setAlias(tableAlias.value());
+        } else {
+            alias.setAlias(Constant.TABLE_ALIAS + index.getAndIncrement());
+        }
+        alias.setAliasDOT(alias.getAlias() + StringPool.DOT);
+        CACHE.put(clazz, alias);
+    }
+
+    public static TableAlias get(Class<?> clazz) {
+        return CACHE.get(clazz);
+    }
+
+    @Data
+    public static class TableAlias {
+        /**
+         * 表别名
+         */
+        private String alias;
+
+        /**
+         * 前缀
+         */
+        private String aliasDOT;
+    }
+
+}

src/main/java/com/baomidou/mybatisplus/core/metadata/MPJTableInfoHelper.java

@@ -66,6 +66,41 @@ public class MPJTableInfoHelper {
         return TABLE_INFO_CACHE.get(clazz);
     }
 
+    /**
+     * <p>
+     * 获取所有实体映射表信息
+     * </p>
+     *
+     * @return 数据库表反射信息集合
+     */
+    public static List<MPJTableInfo> getTableInfos() {
+        return Collections.unmodifiableList(new ArrayList<>(TABLE_INFO_CACHE.values()));
+    }
+
+    /**
+     * <p>
+     * 实体类反射获取表信息【初始化】
+     * </p>
+     *
+     * @param clazz       反射实体类
+     * @param mapperClass mapperClass
+     */
+    @SuppressWarnings("unused")
+    public synchronized static void initTableInfo(MapperBuilderAssistant builderAssistant, Class<?> clazz, Class<?> mapperClass) {
+        MPJTableInfo targetTableInfo = TABLE_INFO_CACHE.get(clazz);
+        final Configuration configuration = builderAssistant.getConfiguration();
+        if (targetTableInfo != null) {
+            Configuration oldConfiguration = targetTableInfo.getTableInfo().getConfiguration();
+            if (!oldConfiguration.equals(configuration)) {
+                // 不是同一个 Configuration,进行重新初始化
+                initTableInfo(configuration, builderAssistant.getCurrentNamespace(), clazz, mapperClass);
+            }
+            return;
+        }
+        initTableInfo(configuration, builderAssistant.getCurrentNamespace(), clazz, mapperClass);
+    }
+
+
     /**
      * <p>
      * 获取所有实体映射表信息

src/main/java/com/github/yulichang/annotation/MPJTableAlias.java

@@ -0,0 +1,25 @@
+package com.github.yulichang.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 关联查询时的表别名<br/>
+ * 框架默认会随机生成 一般是 t1 t2 t3 ...<br/>
+ * 不要在程序中使用随机别名，运行期间是不变的，但是重启就不一定了<br/>
+ * 如需使用请配合此注解一起使用<br/>
+ * <p>
+ * 这个注解定义的表别名或者随机生成的别名只对MPJLambdaWrapper生效<br/>
+ * 对MPJQueryWrapper不生效,
+ *
+ * @author yulichang
+ * @see com.github.yulichang.wrapper.MPJLambdaWrapper
+ * @see com.github.yulichang.query.MPJQueryWrapper
+ * @since 1.2.0
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
+public @interface MPJTableAlias {
+
+    String value();
+}

src/main/java/com/github/yulichang/method/MPJAbstractMethod.java

@@ -1,10 +1,10 @@
 package com.github.yulichang.method;
 
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
+import com.baomidou.mybatisplus.core.metadata.MPJTableAliasHelper;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
-import com.github.yulichang.toolkit.Constant;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,7 +40,7 @@ public abstract class MPJAbstractMethod extends AbstractMethod {
             String[] columns = selectColumns.split(StringPool.COMMA);
             List<String> selectColumnList = new ArrayList<>();
             for (String c : columns) {
-                selectColumnList.add(Constant.TABLE_ALIAS + StringPool.DOT + c);
+                selectColumnList.add(MPJTableAliasHelper.get(table.getEntityType()).getAlias() + StringPool.DOT + c);
             }
             selectColumns = String.join(StringPool.COMMA, selectColumnList);
         }
@@ -58,8 +58,9 @@ public abstract class MPJAbstractMethod extends AbstractMethod {
                 SqlScriptUtils.unSafeParam(Q_WRAPPER_SQL_SELECT), ASTERISK);
     }
 
-    protected String sqlAlias() {
+    protected String sqlAlias(Class<?> modelClass) {
-        return SqlScriptUtils.convertIf("${ew.alias}", String.format("%s != null and %s != ''", "ew.alias", "ew.alias"), false);
+        return SqlScriptUtils.convertChoose(String.format("%s != null and %s != ''", "ew.autoAlias", "ew.autoAlias"),
+                MPJTableAliasHelper.get(modelClass).getAlias(), "${ew.alias}");
     }
 
     protected String sqlFrom() {

src/main/java/com/github/yulichang/method/SelectJoinCount.java

@@ -17,7 +17,7 @@ public class SelectJoinCount extends MPJAbstractMethod {
     public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_COUNT;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlCount(),
-                tableInfo.getTableName(), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
+                tableInfo.getTableName(), sqlAlias(modelClass), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Integer.class);
     }

src/main/java/com/github/yulichang/method/SelectJoinList.java

@@ -15,7 +15,7 @@ public class SelectJoinList extends MPJAbstractMethod {
     public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_LIST;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectColumns(tableInfo, true),
-                tableInfo.getTableName(), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
+                tableInfo.getTableName(), sqlAlias(modelClass), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, MPJResultType.class);
     }

src/main/java/com/github/yulichang/method/SelectJoinMap.java

@@ -17,7 +17,7 @@ public class SelectJoinMap extends MPJAbstractMethod {
     public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_MAP;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectColumns(tableInfo, true),
-                tableInfo.getTableName(), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
+                tableInfo.getTableName(), sqlAlias(modelClass), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Map.class);
     }

src/main/java/com/github/yulichang/method/SelectJoinMaps.java

@@ -17,7 +17,7 @@ public class SelectJoinMaps extends MPJAbstractMethod {
     public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_MAPS;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectColumns(tableInfo, true),
-                tableInfo.getTableName(), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
+                tableInfo.getTableName(), sqlAlias(modelClass), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Map.class);
     }

src/main/java/com/github/yulichang/method/SelectJoinMapsPage.java

@@ -17,7 +17,7 @@ public class SelectJoinMapsPage extends MPJAbstractMethod {
     public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_MAPS_PAGE;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectColumns(tableInfo, true),
-                tableInfo.getTableName(), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
+                tableInfo.getTableName(), sqlAlias(modelClass), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Map.class);
     }

src/main/java/com/github/yulichang/method/SelectJoinOne.java

@@ -15,7 +15,7 @@ public class SelectJoinOne extends MPJAbstractMethod {
     public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_ONE;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectColumns(tableInfo, true),
-                tableInfo.getTableName(), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
+                tableInfo.getTableName(), sqlAlias(modelClass), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, MPJResultType.class);
     }

src/main/java/com/github/yulichang/method/SelectJoinPage.java

@@ -15,7 +15,7 @@ public class SelectJoinPage extends MPJAbstractMethod {
     public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_PAGE;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlSelectColumns(tableInfo, true),
-                tableInfo.getTableName(), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
+                tableInfo.getTableName(), sqlAlias(modelClass), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, MPJResultType.class);
     }

src/main/java/com/github/yulichang/toolkit/Constant.java

@@ -11,8 +11,6 @@ public interface Constant {
      */
     String TABLE_ALIAS = "t";
 
-    String AS = " AS ";
-
     String ON = " ON ";
 
     String JOIN = "JOIN";
@@ -39,9 +37,4 @@ public interface Constant {
      * " INNER JOIN "
      */
     String INNER_JOIN = StringPool.SPACE + INNER + StringPool.SPACE + JOIN + StringPool.SPACE;
-
-    /**
-     * " t"
-     */
-    String SPACE_TABLE_ALIAS = StringPool.SPACE + Constant.TABLE_ALIAS;
 }

src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java

@@ -1,15 +1,14 @@
 package com.github.yulichang.wrapper;
 
+import com.baomidou.mybatisplus.core.metadata.MPJTableAliasHelper;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.github.yulichang.toolkit.Constant;
 import com.github.yulichang.toolkit.LambdaUtils;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 import static java.util.stream.Collectors.joining;
 
@@ -20,12 +19,6 @@ import static java.util.stream.Collectors.joining;
  */
 public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLambdaWrapper<T, Children>>
         extends MPJAbstractWrapper<T, Children> {
-
-    /**
-     * 关联的表
-     */
-    protected Map<Class<?>, Integer> subTable = new HashMap<>();
-
     /**
      * 缓存字段
      */
@@ -33,7 +26,13 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
 
     @Override
     protected <X> String columnToString(X column) {
-        return columnToString((SFunction<?, ?>) column);
+        return columnToString((SFunction<?, ?>) column, hasAlias || entityClass !=
+                LambdaUtils.getEntityClass((SFunction<?, ?>) column));
+    }
+
+    @Override
+    protected <X> String columnToString(X column, boolean hasAlias) {
+        return columnToString((SFunction<?, ?>) column, hasAlias);
     }
 
     @Override
@@ -42,9 +41,9 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
         return Arrays.stream(columns).map(i -> columnToString((SFunction<?, ?>) i)).collect(joining(StringPool.COMMA));
     }
 
-    protected String columnToString(SFunction<?, ?> column) {
+    protected String columnToString(SFunction<?, ?> column, boolean hasAlias) {
-        return Constant.TABLE_ALIAS + getDefault(subTable.get(LambdaUtils.getEntityClass(column))) + StringPool.DOT +
+        return (hasAlias ? MPJTableAliasHelper.get(LambdaUtils.getEntityClass(column)).getAliasDOT() :
-                getCache(column).getColumn();
+                StringPool.EMPTY) + getCache(column).getColumn();
     }
 
     protected ColumnCache getCache(SFunction<?, ?> fn) {
@@ -56,12 +55,4 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
         }
         return cacheMap.get(LambdaUtils.formatKey(LambdaUtils.getName(fn)));
     }
-
-    protected String getDefault(Integer i) {
-        if (Objects.nonNull(i)) {
-            return i.toString();
-        }
-        return StringPool.EMPTY;
-    }
-
 }

src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.wrapper.interfaces.Compare;
 import com.github.yulichang.wrapper.interfaces.Func;
@@ -35,10 +36,17 @@ import static java.util.stream.Collectors.joining;
  *
  * @author yulichang
  */
-@SuppressWarnings("ALL")
+//@SuppressWarnings("ALL")
+@SuppressWarnings({"unchecked", "unused"})
 public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<T, Children>> extends Wrapper<T>
         implements Compare<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children> {
 
+
+    /**
+     * 是否使用别名
+     */
+    protected boolean hasAlias;
+
     /**
      * 占位符
      */
@@ -51,7 +59,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     /**
      * 其他
      */
-    /* mybatis plus 3.4.3新增 这个时wrapper的别名 不是MPJ的别名 */
+    /* mybatis plus 3.4.3新增 这个是wrapper的别名 不是MPJ的别名 */
     protected SharedString paramAlias;
     protected SharedString lastSql;
     /**
@@ -71,32 +79,13 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     /**
      * 实体类型(主要用于确定泛型以及取TableInfo缓存)
      */
-    private Class<T> entityClass;
+    protected Class<?> entityClass;
 
     @Override
     public T getEntity() {
         return entity;
     }
 
-    public Children setEntity(T entity) {
-        this.entity = entity;
-        return typedThis;
-    }
-
-    public Class<T> getEntityClass() {
-        if (entityClass == null && entity != null) {
-            entityClass = (Class<T>) entity.getClass();
-        }
-        return entityClass;
-    }
-
-    public Children setEntityClass(Class<T> entityClass) {
-        if (entityClass != null) {
-            this.entityClass = entityClass;
-        }
-        return typedThis;
-    }
-
     @Override
     public <X, V> Children allEq(boolean condition, Map<SFunction<X, ?>, V> params, boolean null2IsNull) {
         if (condition && CollectionUtils.isNotEmpty(params)) {
@@ -329,7 +318,6 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      * 字段 SQL 注入过滤处理，子类重写实现过滤逻辑
      *
      * @param column 字段内容
-     * @return
      */
     protected <X> SFunction<X, ?> columnSqlInjectFilter(SFunction<X, ?> column) {
         return column;
@@ -384,9 +372,11 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
                 () -> formatParam(null, val)));
     }
 
-    protected <X, S> Children addCondition(boolean condition, SFunction<X, ?> column, SqlKeyword sqlKeyword, SFunction<S, ?> val) {
+    protected <X, S> Children addCondition(boolean condition, SFunction<X, ?> column, SqlKeyword sqlKeyword,
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), sqlKeyword,
+                                           SFunction<S, ?> val) {
-                columnToSqlSegment(val)));
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column, hasAlias || entityClass !=
+                LambdaUtils.getEntityClass(column)), sqlKeyword, columnToSqlSegment(val, hasAlias ||
+                entityClass != LambdaUtils.getEntityClass(val))));
     }
 
     /**
@@ -417,6 +407,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      * @param params  参数
      * @return sql片段
      */
+    @SuppressWarnings("SameParameterValue")
     protected final String formatSqlMaybeWithParam(String sqlStr, String mapping, Object... params) {
         if (StringUtils.isBlank(sqlStr)) {
             // todo 何时会这样?
@@ -572,6 +563,10 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         return () -> columnToString(column);
     }
 
+    protected final <X> ISqlSegment columnToSqlSegment(SFunction<X, ?> column, boolean hasAlias) {
+        return () -> columnToString(column, hasAlias);
+    }
+
     /**
      * 获取 columnName
      */
@@ -579,6 +574,10 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         return (String) column;
     }
 
+    protected <X> String columnToString(X column, boolean hasAlias) {
+        return (String) column;
+    }
+
     /**
      * 多字段转换为逗号 "," 分割字符串
      *
@@ -634,36 +633,4 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     public <R, S> Children le(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
         return addCondition(condition, column, LE, val);
     }
-
-    @Override
-    public <R, S, U> Children between(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val1, SFunction<U, ?> val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), BETWEEN,
-                columnToSqlSegment(val1), AND, columnToSqlSegment(val2)));
-    }
-
-    public <R, S> Children between(boolean condition, SFunction<R, ?> column, Object val1, SFunction<S, ?> val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), BETWEEN,
-                () -> formatParam(null, val1), AND, columnToSqlSegment(val2)));
-    }
-
-    public <R, S> Children between(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val1, Object val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), BETWEEN,
-                columnToSqlSegment(val1), AND, () -> formatParam(null, val2)));
-    }
-
-    @Override
-    public <R, S, U> Children notBetween(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val1, SFunction<U, ?> val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), NOT_BETWEEN,
-                columnToSqlSegment(val1), AND, columnToSqlSegment(val2)));
-    }
-
-    public <R, U> Children notBetween(boolean condition, SFunction<R, ?> column, Object val1, SFunction<U, ?> val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), NOT_BETWEEN,
-                () -> formatParam(null, val1), AND, columnToSqlSegment(val2)));
-    }
-
-    public <R, S> Children notBetween(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val1, Object val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), NOT_BETWEEN,
-                columnToSqlSegment(val1), AND, () -> formatParam(null, val2)));
-    }
 }

src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java

@@ -2,9 +2,7 @@ package com.github.yulichang.wrapper;
 
 import com.baomidou.mybatisplus.core.conditions.SharedString;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
-import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
+import com.baomidou.mybatisplus.core.metadata.*;
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.toolkit.Constant;
@@ -13,13 +11,10 @@ import com.github.yulichang.wrapper.enums.BaseFuncEnum;
 import com.github.yulichang.wrapper.interfaces.LambdaJoin;
 import com.github.yulichang.wrapper.interfaces.Query;
 import com.github.yulichang.wrapper.interfaces.on.OnFunction;
-import lombok.Data;
-import lombok.Getter;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -33,61 +28,40 @@ import java.util.stream.Collectors;
  * @author yulichang
  * @see com.github.yulichang.toolkit.Wrappers
  */
-@SuppressWarnings("all")
+@SuppressWarnings("unused")
 public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWrapper<T>>
         implements Query<MPJLambdaWrapper<T>>, LambdaJoin<MPJLambdaWrapper<T>> {
 
     /**
      * 查询字段 sql
      */
-    private SharedString sqlSelect = new SharedString();
+    private final SharedString sqlSelect = new SharedString();
 
     /**
      * 查询表
      */
     private final SharedString from = new SharedString();
 
-    /**
-     * 主表别名
-     */
-    private final SharedString alias = new SharedString(Constant.TABLE_ALIAS);
-
     /**
      * 查询的字段
      */
-    private final List<SelectColumn> selectColumns = new ArrayList<>();
+    private final List<String> selectColumns = new ArrayList<>();
 
     /**
      * 忽略查询的字段
      */
-    private final List<SelectColumn> ignoreColumns = new ArrayList<>();
+    private final List<String> ignoreColumns = new ArrayList<>();
-
-    /**
-     * 表序号
-     */
-    private int tableIndex = 1;
 
     /**
      * ON sql wrapper集合
      */
-    private final List<MPJLambdaWrapper<?>> onWrappers = new ArrayList<>();
+    private final List<String> joinSql = new ArrayList<>();
-
-    /**
-     * 连表关键字 on 条件 func 使用
-     */
-    @Getter
-    private String keyWord;
-
-    /**
-     * 连表实体类 on 条件 func 使用
-     */
-    @Getter
-    private Class<?> joinClass;
 
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery()
      */
     public MPJLambdaWrapper() {
+        this.hasAlias = true;
         super.initNeed();
     }
 
@@ -95,22 +69,27 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(...)
      */
-    MPJLambdaWrapper(T entity, Class<T> entityClass, SharedString sqlSelect, AtomicInteger paramNameSeq,
+    MPJLambdaWrapper(Class<?> entityClass, AtomicInteger paramNameSeq,
                      Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
-                     SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
+                     SharedString lastSql, SharedString sqlComment, SharedString sqlFirst, boolean hasAlias) {
-                     Map<Class<?>, Integer> subTable, String keyWord, Class<?> joinClass) {
+        this.entityClass = entityClass;
-        super.setEntity(entity);
-        super.setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
         this.paramNameValuePairs = paramNameValuePairs;
         this.expression = mergeSegments;
-        this.sqlSelect = sqlSelect;
         this.lastSql = lastSql;
         this.sqlComment = sqlComment;
         this.sqlFirst = sqlFirst;
-        this.subTable = subTable;
+        this.hasAlias = hasAlias;
-        this.keyWord = keyWord;
+    }
-        this.joinClass = joinClass;
+
+    @Override
+    protected MPJLambdaWrapper<T> instance() {
+        return instance(true, null);
+    }
+
+    protected MPJLambdaWrapper<T> instance(boolean hasAlias, Class<?> entityClass) {
+        return new MPJLambdaWrapper<>(entityClass, paramNameSeq, paramNameValuePairs, new MergeSegments(),
+                SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(), hasAlias);
     }
 
     @Override
@@ -118,7 +97,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     public final <S> MPJLambdaWrapper<T> select(SFunction<S, ?>... columns) {
         if (ArrayUtils.isNotEmpty(columns)) {
             for (SFunction<S, ?> s : columns) {
-                selectColumns.add(SelectColumn.of(LambdaUtils.getEntityClass(s), getCache(s).getColumn()));
+                selectColumns.add(getThisAlias(s) + getCache(s).getColumn());
             }
         }
         return typedThis;
@@ -128,20 +107,23 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     public <E> MPJLambdaWrapper<T> select(Class<E> entityClass, Predicate<TableFieldInfo> predicate) {
         TableInfo info = TableInfoHelper.getTableInfo(entityClass);
         Assert.notNull(info, "table can not be find");
-        info.getFieldList().stream().filter(predicate).collect(Collectors.toList()).forEach(
+        MPJTableAliasHelper.TableAlias alias = MPJTableAliasHelper.get(entityClass);
-                i -> selectColumns.add(SelectColumn.of(entityClass, i.getColumn())));
+        info.getFieldList().stream().filter(predicate).collect(Collectors.toList()).forEach(i ->
+                selectColumns.add((hasAlias ? alias.getAliasDOT() : StringPool.EMPTY) + i.getColumn()));
         return typedThis;
     }
 
     @Override
     public <S> MPJLambdaWrapper<T> selectAs(SFunction<S, ?> column, String alias) {
-        selectColumns.add(SelectColumn.of(LambdaUtils.getEntityClass(column), getCache(column).getColumn(), alias));
+        selectColumns.add(getThisAlias(column) + getCache(column).getColumn() + Constants.AS + alias);
         return typedThis;
     }
 
-    public <S> MPJLambdaWrapper<T> selectFunc(boolean condition, BaseFuncEnum funcEnum, SFunction<S, ?> column, String alias) {
+    public <S> MPJLambdaWrapper<T> selectFunc(boolean condition, BaseFuncEnum funcEnum, SFunction<S, ?> column,
+                                              String alias) {
         if (condition) {
-            selectColumns.add(SelectColumn.of(LambdaUtils.getEntityClass(column), getCache(column).getColumn(), alias, funcEnum));
+            selectColumns.add(String.format(funcEnum.getSql(), getThisAlias(column) + getCache(column).getColumn())
+                    + Constants.AS + alias);
         }
         return typedThis;
     }
@@ -149,7 +131,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     @Override
     public MPJLambdaWrapper<T> selectFunc(boolean condition, BaseFuncEnum funcEnum, Object column, String alias) {
         if (condition) {
-            selectColumns.add(SelectColumn.of(null, column.toString(), alias, funcEnum));
+            selectColumns.add(String.format(funcEnum.getSql(), column.toString()) + Constants.AS + alias);
         }
         return typedThis;
     }
@@ -157,11 +139,12 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     public final MPJLambdaWrapper<T> selectAll(Class<?> clazz) {
         TableInfo info = TableInfoHelper.getTableInfo(clazz);
         Assert.notNull(info, "table can not be find -> %s", clazz);
+        String dot = hasAlias ? MPJTableAliasHelper.get(clazz).getAliasDOT() : StringPool.EMPTY;
         if (info.havePK()) {
-            selectColumns.add(SelectColumn.of(clazz, info.getKeyColumn()));
+            selectColumns.add(dot + info.getKeyColumn());
         }
-        info.getFieldList().forEach(c ->
+        info.getFieldList().stream().filter(TableFieldInfo::isSelect).forEach(c ->
-                selectColumns.add(SelectColumn.of(clazz, c.getColumn())));
+                selectColumns.add(dot + c.getColumn()));
         return typedThis;
     }
 
@@ -170,12 +153,21 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     public final <S> MPJLambdaWrapper<T> selectIgnore(SFunction<S, ?>... columns) {
         if (ArrayUtils.isNotEmpty(columns)) {
             for (SFunction<S, ?> s : columns) {
-                ignoreColumns.add(SelectColumn.of(LambdaUtils.getEntityClass(s), getCache(s).getColumn()));
+                ignoreColumns.add(getThisAlias(s) + getCache(s).getColumn());
             }
         }
         return typedThis;
     }
 
+
+    @Override
+    public MPJLambdaWrapper<T> selectQuery(Class<?> clazz, OnFunction function, String alias) {
+        MPJLambdaWrapper<?> apply = function.apply(instance(false, clazz));
+        selectColumns.add(String.format("(SELECT %s FROM %s %s)", apply.getSqlSelect(),
+                TableInfoHelper.getTableInfo(clazz).getTableName(), apply.getCustomSqlSegment()) + Constants.AS + alias);
+        return this;
+    }
+
     /**
      * 查询条件 SQL 片段
      */
@@ -183,15 +175,9 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     public String getSqlSelect() {
         if (StringUtils.isBlank(sqlSelect.getStringValue())) {
             if (CollectionUtils.isNotEmpty(ignoreColumns)) {
-                selectColumns.removeIf(c -> c.getFuncEnum() == null && ignoreColumns.stream().anyMatch(i ->
+                selectColumns.removeIf(ignoreColumns::contains);
-                        i.getClazz() == c.getClazz() && Objects.equals(c.getColumnName(), i.getColumnName())));
             }
-            String s = selectColumns.stream().map(i -> {
+            sqlSelect.setStringValue(String.join(StringPool.COMMA, selectColumns));
-                String str = Constant.TABLE_ALIAS + getDefault(subTable.get(i.getClazz())) + StringPool.DOT + i.getColumnName();
-                return (i.getFuncEnum() == null ? str : String.format(i.getFuncEnum().getSql(), str)) +
-                        (StringUtils.isBlank(i.getAlias()) ? StringPool.EMPTY : (Constant.AS + i.getAlias()));
-            }).collect(Collectors.joining(StringPool.COMMA));
-            sqlSelect.setStringValue(s);
         }
         return sqlSelect.getStringValue();
     }
@@ -201,39 +187,15 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
      */
     public String getFrom() {
         if (StringUtils.isBlank(from.getStringValue())) {
-            StringBuilder value = new StringBuilder();
+            from.setStringValue(String.join(StringPool.SPACE, joinSql));
-            for (MPJLambdaWrapper<?> wrapper : onWrappers) {
-                String tableName = TableInfoHelper.getTableInfo(wrapper.getJoinClass()).getTableName();
-                value.append(wrapper.getKeyWord())
-                        .append(tableName)
-                        .append(Constant.SPACE_TABLE_ALIAS)
-                        .append(subTable.get(wrapper.getJoinClass()))
-                        .append(Constant.ON)
-                        .append(wrapper.getExpression().getNormal().getSqlSegment());
-            }
-            from.setStringValue(value.toString());
         }
         return from.getStringValue();
     }
 
-    public String getAlias() {
+    public boolean getAutoAlias() {
-        return alias.getStringValue();
+        return true;
     }
 
-    /**
-     * 用于生成嵌套 sql
-     * <p>故 sqlSelect 不向下传递</p>
-     */
-    @Override
-    protected MPJLambdaWrapper<T> instance() {
-        return instance(null, null);
-    }
-
-    protected MPJLambdaWrapper<T> instance(String keyWord, Class<?> joinClass) {
-        return new MPJLambdaWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
-                new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                this.subTable, keyWord, joinClass);
-    }
 
     @Override
     public void clear() {
@@ -242,68 +204,21 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
         from.toNull();
         selectColumns.clear();
         ignoreColumns.clear();
-        subTable.clear();
+        joinSql.clear();
     }
 
     @Override
     public <R> MPJLambdaWrapper<T> join(String keyWord, boolean condition, Class<R> clazz, OnFunction function) {
         if (condition) {
-            MPJLambdaWrapper<?> apply = function.apply(instance(keyWord, clazz));
+            joinSql.add(keyWord + TableInfoHelper.getTableInfo(clazz).getTableName() +
-            onWrappers.add(apply);
+                    Constants.SPACE + MPJTableAliasHelper.get(clazz).getAlias() +
-            subTable.put(clazz, tableIndex);
+                    Constant.ON + function.apply(instance()).getExpression().getNormal().getSqlSegment());
-            tableIndex++;
         }
         return typedThis;
     }
 
-    /**
+    private String getThisAlias(SFunction<?, ?> function) {
-     * select字段
+        return hasAlias ? MPJTableAliasHelper.get(LambdaUtils.getEntityClass(function)).getAliasDOT() :
-     */
+                StringPool.EMPTY;
-    @Data
-    public static class SelectColumn {
-
-        /**
-         * 字段实体类
-         */
-        private Class<?> clazz;
-
-        /**
-         * 数据库字段名
-         */
-        private String columnName;
-
-        /**
-         * 字段别名
-         */
-        private String alias;
-
-        /**
-         * 字段函数
-         */
-        private BaseFuncEnum funcEnum;
-
-        /**
-         * 自定义函数填充参数
-         */
-        private List<SFunction<?, ?>> funcArgs;
-
-        private SelectColumn(Class<?> clazz, String columnName, String alias, BaseFuncEnum funcEnum) {
-            this.clazz = clazz;
-            this.columnName = columnName;
-            this.alias = alias;
-            this.funcEnum = funcEnum;
-        }
-
-        public static SelectColumn of(Class<?> clazz, String columnName) {
-            return new SelectColumn(clazz, columnName, null, null);
-        }
-
-        public static SelectColumn of(Class<?> clazz, String columnName, String alias) {
-            return new SelectColumn(clazz, columnName, alias, null);
-        }
-
-        public static SelectColumn of(Class<?> clazz, String columnName, String alias, BaseFuncEnum funcEnum) {
-            return new SelectColumn(clazz, columnName, alias, funcEnum);
-        }
     }
 }

src/main/java/com/github/yulichang/wrapper/interfaces/Query.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.wrapper.enums.BaseFuncEnum;
 import com.github.yulichang.wrapper.enums.DefaultFuncEnum;
+import com.github.yulichang.wrapper.interfaces.on.OnFunction;
 
 import java.io.Serializable;
 import java.util.function.Predicate;
@@ -51,6 +52,22 @@ public interface Query<Children> extends Serializable {
      */
     <S> Children selectAs(SFunction<S, ?> column, String alias);
 
+    /**
+     * 子查询
+     *
+     * @param clazz    查询的类
+     * @param function 查询lambda
+     * @param alias    别名
+     */
+    Children selectQuery(Class<?> clazz, OnFunction function, String alias);
+
+    /**
+     * ignore
+     */
+    default <S> Children selectQuery(Class<?> clazz, OnFunction function, SFunction<S, ?> alias) {
+        return selectQuery(clazz, function, LambdaUtils.getName(alias));
+    }
+
     /**
      * 聚合函数查询
      *

src/main/java/com/github/yulichang/wrapper/interfaces/on/OnCompare.java

@@ -115,40 +115,4 @@ public interface OnCompare<Children> extends Serializable {
      * @return children
      */
     <R, S> Children le(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val);
-
-    /**
-     * ignore
-     */
-    default <R, S, T> Children between(SFunction<R, ?> column, SFunction<S, ?> val1, SFunction<T, ?> val2) {
-        return between(true, column, val1, val2);
-    }
-
-    /**
-     * BETWEEN 值1 AND 值2
-     *
-     * @param condition 执行条件
-     * @param column    字段
-     * @param val1      值1
-     * @param val2      值2
-     * @return children
-     */
-    <R, S, T> Children between(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val1, SFunction<T, ?> val2);
-
-    /**
-     * ignore
-     */
-    default <R, S, T> Children notBetween(SFunction<R, ?> column, SFunction<S, ?> val1, SFunction<T, ?> val2) {
-        return notBetween(true, column, val1, val2);
-    }
-
-    /**
-     * NOT BETWEEN 值1 AND 值2
-     *
-     * @param condition 执行条件
-     * @param column    字段
-     * @param val1      值1
-     * @param val2      值2
-     * @return children
-     */
-    <R, S, T> Children notBetween(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val1, SFunction<T, ?> val2);
 }