From fd6de6f50b30056870709168d5c53c51e3853d61 Mon Sep 17 00:00:00 2001 From: admin <570810310@qq.com> Date: Thu, 22 Apr 2021 17:30:07 +0800 Subject: [PATCH] https://gitee.com/best_handsome/mybatis-plus-join/issues/I3NMQT --- .../github/yulichang/base/MPJBaseMapper.java | 32 +-- .../yulichang/config/InterceptorConfig.java | 52 ++++ .../yulichang/exception/MPJException.java | 13 + .../github/yulichang/toolkit/Wrappers.java | 12 +- .../wrapper/MPJJoinLambdaQueryWrapper.java | 261 +---------------- .../yulichang/wrapper/MPJLambdaWrapper.java | 266 ++++++++++++++++++ src/main/resources/META-INF/spring.factories | 3 +- 7 files changed, 358 insertions(+), 281 deletions(-) create mode 100644 src/main/java/com/github/yulichang/config/InterceptorConfig.java create mode 100644 src/main/java/com/github/yulichang/exception/MPJException.java create mode 100644 src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java diff --git a/src/main/java/com/github/yulichang/base/MPJBaseMapper.java b/src/main/java/com/github/yulichang/base/MPJBaseMapper.java index cd029c8..26a8e04 100644 --- a/src/main/java/com/github/yulichang/base/MPJBaseMapper.java +++ b/src/main/java/com/github/yulichang/base/MPJBaseMapper.java @@ -19,51 +19,51 @@ public interface MPJBaseMapper extends BaseMapper { /** * 连表查询返回一条记录 * - * @param myWrapper joinWrapper - * @param clazz resultType + * @param wrapper joinWrapper + * @param clazz resultType */ DTO selectJoinOne(@Param(Constant.CLAZZ) Class clazz, - @Param(Constants.WRAPPER) MPJBaseJoin myWrapper); + @Param(Constants.WRAPPER) MPJBaseJoin wrapper); /** * 连表查询返回Map * - * @param myWrapper joinWrapper + * @param wrapper joinWrapper */ - Map selectJoinMap(@Param(Constants.WRAPPER) MPJBaseJoin myWrapper); + Map selectJoinMap(@Param(Constants.WRAPPER) MPJBaseJoin wrapper); /** * 连表查询返回记录集合 * - * @param myWrapper joinWrapper - * @param clazz resultType + * @param wrapper joinWrapper + * @param clazz resultType */ List selectJoinList(@Param(Constant.CLAZZ) Class clazz, - @Param(Constants.WRAPPER) MPJBaseJoin myWrapper); + @Param(Constants.WRAPPER) MPJBaseJoin wrapper); /** * 连表查询返回Map集合 * - * @param myWrapper joinWrapper + * @param wrapper joinWrapper */ - List> selectJoinMaps(@Param(Constants.WRAPPER) MPJBaseJoin myWrapper); + List> selectJoinMaps(@Param(Constants.WRAPPER) MPJBaseJoin wrapper); /** * 连表查询返回记录集合并分页 * - * @param myWrapper joinWrapper - * @param clazz resultType - * @param 分页返回对象 + * @param wrapper joinWrapper + * @param clazz resultType + * @param 分页返回对象 */ > IPage selectJoinPage(P page, @Param(Constant.CLAZZ) Class clazz, - @Param(Constants.WRAPPER) MPJBaseJoin myWrapper); + @Param(Constants.WRAPPER) MPJBaseJoin wrapper); /** * 连表查询返回Map集合并分页 * - * @param myWrapper joinWrapper + * @param wrapper joinWrapper */

> IPage> selectJoinMapsPage(P page, - @Param(Constants.WRAPPER) MPJBaseJoin myWrapper); + @Param(Constants.WRAPPER) MPJBaseJoin wrapper); } diff --git a/src/main/java/com/github/yulichang/config/InterceptorConfig.java b/src/main/java/com/github/yulichang/config/InterceptorConfig.java new file mode 100644 index 0000000..2f16659 --- /dev/null +++ b/src/main/java/com/github/yulichang/config/InterceptorConfig.java @@ -0,0 +1,52 @@ +package com.github.yulichang.config; + +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.github.yulichang.exception.MPJException; +import com.github.yulichang.interceptor.MPJInterceptor; +import org.apache.ibatis.plugin.Interceptor; +import org.apache.ibatis.plugin.InterceptorChain; +import org.apache.ibatis.session.Configuration; +import org.apache.ibatis.session.SqlSessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.event.ApplicationStartedEvent; +import org.springframework.context.ApplicationListener; + +import java.lang.reflect.Field; +import java.util.List; + +/** + * 拦截器配置类 如果配置了分页插件,可能会使拦截器失效 + * 此类的作用就是校验拦截器顺序,保证连表插件在其他拦截器之前执行 + * + * @author yulichang + */ +public class InterceptorConfig implements ApplicationListener { + + @Autowired + private List sqlSessionFactoryList; + @Autowired + private MPJInterceptor mpjInterceptor; + + @Override + @SuppressWarnings("unchecked") + public void onApplicationEvent(ApplicationStartedEvent event) { + if (CollectionUtils.isNotEmpty(sqlSessionFactoryList)) { + try { + for (SqlSessionFactory factory : sqlSessionFactoryList) { + Field interceptorChain = Configuration.class.getDeclaredField("interceptorChain"); + interceptorChain.setAccessible(true); + InterceptorChain chain = (InterceptorChain) interceptorChain.get(factory.getConfiguration()); + Field interceptors = InterceptorChain.class.getDeclaredField("interceptors"); + interceptors.setAccessible(true); + List list = (List) interceptors.get(chain); + if (CollectionUtils.isNotEmpty(list) && list.get(list.size() - 1) != mpjInterceptor) { + list.removeIf(i -> i == mpjInterceptor); + list.add(mpjInterceptor); + } + } + } catch (Exception ignored) { + throw new MPJException("mpjInterceptor exception"); + } + } + } +} diff --git a/src/main/java/com/github/yulichang/exception/MPJException.java b/src/main/java/com/github/yulichang/exception/MPJException.java new file mode 100644 index 0000000..e3f27a2 --- /dev/null +++ b/src/main/java/com/github/yulichang/exception/MPJException.java @@ -0,0 +1,13 @@ +package com.github.yulichang.exception; + +/** + * mpj 异常 + * + * @author yulichang + */ +public class MPJException extends RuntimeException { + + public MPJException(String msg) { + super(msg); + } +} diff --git a/src/main/java/com/github/yulichang/toolkit/Wrappers.java b/src/main/java/com/github/yulichang/toolkit/Wrappers.java index c2b5288..b92eb48 100644 --- a/src/main/java/com/github/yulichang/toolkit/Wrappers.java +++ b/src/main/java/com/github/yulichang/toolkit/Wrappers.java @@ -1,8 +1,7 @@ package com.github.yulichang.toolkit; -import com.github.yulichang.query.MPJLambdaQueryWrapper; import com.github.yulichang.query.MPJQueryWrapper; -import com.github.yulichang.wrapper.MPJJoinLambdaQueryWrapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; /** * Wrapper 条件构造 @@ -15,12 +14,7 @@ public class Wrappers { return new MPJQueryWrapper<>(); } - @Deprecated - public static MPJLambdaQueryWrapper lambdaJoin() { - return new MPJLambdaQueryWrapper<>(); - } - - public static MPJJoinLambdaQueryWrapper lambdaJoinWrapper() { - return new MPJJoinLambdaQueryWrapper<>(); + public static MPJLambdaWrapper lambdaJoin() { + return new MPJLambdaWrapper<>(); } } diff --git a/src/main/java/com/github/yulichang/wrapper/MPJJoinLambdaQueryWrapper.java b/src/main/java/com/github/yulichang/wrapper/MPJJoinLambdaQueryWrapper.java index bfe4ac1..59cd680 100644 --- a/src/main/java/com/github/yulichang/wrapper/MPJJoinLambdaQueryWrapper.java +++ b/src/main/java/com/github/yulichang/wrapper/MPJJoinLambdaQueryWrapper.java @@ -1,265 +1,16 @@ 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.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; -import com.github.yulichang.toolkit.LambdaUtils; -import com.github.yulichang.wrapper.interfaces.LambdaJoin; -import com.github.yulichang.wrapper.interfaces.SFunctionQuery; - -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; - /** * copy {@link com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper} + *

+ * 名字太长 变更为MPJLambdaWrapper + * 推荐 使用 Wrappers.<>lambdaJoin(); 构造器 * * @author yulichang */ -@SuppressWarnings("all") -public class MPJJoinLambdaQueryWrapper extends MPJAbstractLambdaWrapper> - implements SFunctionQuery>, LambdaJoin> { - - /** - * 查询字段 sql - */ - private SharedString sqlSelect = new SharedString(); - - /** - * 查询表 - */ - private final SharedString from = new SharedString(); - - /** - * 主表别名 - */ - private final SharedString alias = new SharedString(Constant.TABLE_ALIAS); - - /** - * 查询的字段 - */ - private final List selectColumns = new ArrayList<>(); - - /** - * 忽略查询的字段 - */ - private final List ignoreColumns = new ArrayList<>(); - - /** - * 表序号 - */ - private int tableIndex = 1; - - /** - * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery() - */ - public MPJJoinLambdaQueryWrapper() { - super.initNeed(); - } - - /** - * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(...) - */ - MPJJoinLambdaQueryWrapper(T entity, Class entityClass, SharedString sqlSelect, AtomicInteger paramNameSeq, - Map paramNameValuePairs, MergeSegments mergeSegments, - SharedString lastSql, SharedString sqlComment, SharedString sqlFirst, - Map, Integer> subTable) { - 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; - } - - /** - * SELECT 部分 SQL 设置 - * - * @param columns 查询字段 - */ - @SafeVarargs - public final MPJJoinLambdaQueryWrapper select(SFunction... columns) { - if (ArrayUtils.isNotEmpty(columns)) { - for (SFunction s : columns) { - selectColumns.add(new SelectColumn(LambdaUtils.getEntityClass(s), LambdaUtils.getColumn(s), null)); - } - } - return typedThis; - } - - public MPJJoinLambdaQueryWrapper select(Class entityClass, Predicate predicate) { - TableInfo info = TableInfoHelper.getTableInfo(entityClass); - Assert.notNull(info, "table can not be find"); - info.getFieldList().stream().filter(predicate).collect(Collectors.toList()).forEach( - i -> selectColumns.add(new SelectColumn(entityClass, i.getColumn(), null))); - return typedThis; - } - - public final MPJJoinLambdaQueryWrapper selectAs(SFunction columns, SFunction alias) { - return selectAs(columns, LambdaUtils.getName(alias)); - } - - /** - * @since 1.1.3 - */ - public final MPJJoinLambdaQueryWrapper selectAs(SFunction columns, String alias) { - selectColumns.add(new SelectColumn(LambdaUtils.getEntityClass(columns), LambdaUtils.getColumn(columns), alias)); - return typedThis; - } - - public final MPJJoinLambdaQueryWrapper selectAll(Class clazz) { - TableInfo info = TableInfoHelper.getTableInfo(clazz); - Assert.notNull(info, "table can not be find -> %s", clazz); - if (info.havePK()) { - selectColumns.add(new SelectColumn(clazz, info.getKeyColumn(), null)); - } - info.getFieldList().forEach(c -> - selectColumns.add(new SelectColumn(clazz, c.getColumn(), null))); - return typedThis; - } - - /** - * 忽略查询字段 - *

- * 用法: selectIgnore(UserDO::getId,UserDO::getSex) - * 注意: 一个selectIgnore只支持一个对象 如果要忽略多个实体的字段,请调用多次 - *

- * .selectIgnore(UserDO::getId,UserDO::getSex) - * .selectIgnore(UserAddressDO::getArea,UserAddressDO::getCity) - * - * @since 1.1.3 - */ - @SafeVarargs - public final MPJJoinLambdaQueryWrapper selectIgnore(SFunction... columns) { - if (ArrayUtils.isNotEmpty(columns)) { - for (SFunction s : columns) { - ignoreColumns.add(new SelectColumn(LambdaUtils.getEntityClass(s), LambdaUtils.getColumn(s), null)); - } - } - return typedThis; - } - - @Override - public String getSqlSelect() { - if (StringUtils.isBlank(sqlSelect.getStringValue())) { - if (CollectionUtils.isNotEmpty(ignoreColumns)) { - selectColumns.removeIf(c -> ignoreColumns.stream().anyMatch(i -> - i.getClazz() == c.getClazz() && Objects.equals(c.getColumnName(), i.getColumnName()))); - } - String s = selectColumns.stream().map(i -> - Constant.TABLE_ALIAS + getDefault(subTable.get(i.getClazz())) + StringPool.DOT + i.getColumnName() + - (StringUtils.isBlank(i.getAlias()) ? StringPool.EMPTY : (Constant.AS + i.getAlias()))) - .collect(Collectors.joining(StringPool.COMMA)); - sqlSelect.setStringValue(s); - } - return sqlSelect.getStringValue(); - } +@Deprecated +@SuppressWarnings("DeprecatedIsStillUsed") +public class MPJJoinLambdaQueryWrapper extends MPJLambdaWrapper { - public String getFrom() { - return from.getStringValue(); - } - - public String getAlias() { - return alias.getStringValue(); - } - - /** - * 用于生成嵌套 sql - *

故 sqlSelect 不向下传递

- */ - @Override - protected MPJJoinLambdaQueryWrapper instance() { - return new MPJJoinLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs, - new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(), - this.subTable); - } - - @Override - public void clear() { - super.clear(); - sqlSelect.toNull(); - } - - @Override - public MPJJoinLambdaQueryWrapper join(String keyWord, boolean condition, Class clazz, SFunction left, SFunction right) { - if (condition) { - subTable.put(clazz, tableIndex); - TableInfo leftInfo = TableInfoHelper.getTableInfo(clazz); - StringBuilder sb = new StringBuilder(keyWord) - .append(leftInfo.getTableName()) - .append(Constant.SPACE_TABLE_ALIAS) - .append(tableIndex) - .append(Constant.ON_TABLE_ALIAS) - .append(tableIndex) - .append(StringPool.DOT) - .append(LambdaUtils.getColumn(left)) - .append(Constant.EQUALS_TABLE_ALIAS) - .append(getDefault(subTable.get(LambdaUtils.getEntityClass(right)))) - .append(StringPool.DOT) - .append(LambdaUtils.getColumn(right)); - tableIndex++; - if (StringUtils.isBlank(from.getStringValue())) { - from.setStringValue(sb.toString()); - } else { - from.setStringValue(from.getStringValue() + sb.toString()); - } - } - return typedThis; - } - - /** - * select字段 - */ - public static class SelectColumn { - - private Class clazz; - - private String columnName; - - private String alias; - - public SelectColumn(Class clazz, String columnName, String alias) { - this.clazz = clazz; - this.columnName = columnName; - this.alias = alias; - } - - public Class getClazz() { - return clazz; - } - - public void setClazz(Class clazz) { - this.clazz = clazz; - } - - public String getColumnName() { - return columnName; - } - - public void setColumnName(String columnName) { - this.columnName = columnName; - } - - public String getAlias() { - return alias; - } - - public void setAlias(String alias) { - this.alias = alias; - } - } } diff --git a/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java new file mode 100644 index 0000000..457f000 --- /dev/null +++ b/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java @@ -0,0 +1,266 @@ +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.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; +import com.github.yulichang.toolkit.LambdaUtils; +import com.github.yulichang.wrapper.interfaces.LambdaJoin; +import com.github.yulichang.wrapper.interfaces.SFunctionQuery; + +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; + +/** + * copy {@link com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper} + * Lambda 语法使用 Wrapper + * + * @author yulichang + */ +@SuppressWarnings("all") +public class MPJLambdaWrapper extends MPJAbstractLambdaWrapper> + implements SFunctionQuery>, LambdaJoin> { + + /** + * 查询字段 sql + */ + private SharedString sqlSelect = new SharedString(); + + /** + * 查询表 + */ + private final SharedString from = new SharedString(); + + /** + * 主表别名 + */ + private final SharedString alias = new SharedString(Constant.TABLE_ALIAS); + + /** + * 查询的字段 + */ + private final List selectColumns = new ArrayList<>(); + + /** + * 忽略查询的字段 + */ + private final List ignoreColumns = new ArrayList<>(); + + /** + * 表序号 + */ + private int tableIndex = 1; + + /** + * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery() + */ + public MPJLambdaWrapper() { + super.initNeed(); + } + + /** + * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(...) + */ + MPJLambdaWrapper(T entity, Class entityClass, SharedString sqlSelect, AtomicInteger paramNameSeq, + Map paramNameValuePairs, MergeSegments mergeSegments, + SharedString lastSql, SharedString sqlComment, SharedString sqlFirst, + Map, Integer> subTable) { + 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; + } + + /** + * SELECT 部分 SQL 设置 + * + * @param columns 查询字段 + */ + @SafeVarargs + public final MPJLambdaWrapper select(SFunction... columns) { + if (ArrayUtils.isNotEmpty(columns)) { + for (SFunction s : columns) { + selectColumns.add(new SelectColumn(LambdaUtils.getEntityClass(s), LambdaUtils.getColumn(s), null)); + } + } + return typedThis; + } + + public MPJLambdaWrapper select(Class entityClass, Predicate predicate) { + TableInfo info = TableInfoHelper.getTableInfo(entityClass); + Assert.notNull(info, "table can not be find"); + info.getFieldList().stream().filter(predicate).collect(Collectors.toList()).forEach( + i -> selectColumns.add(new SelectColumn(entityClass, i.getColumn(), null))); + return typedThis; + } + + public final MPJLambdaWrapper selectAs(SFunction columns, SFunction alias) { + return selectAs(columns, LambdaUtils.getName(alias)); + } + + /** + * @since 1.1.3 + */ + public final MPJLambdaWrapper selectAs(SFunction columns, String alias) { + selectColumns.add(new SelectColumn(LambdaUtils.getEntityClass(columns), LambdaUtils.getColumn(columns), alias)); + return typedThis; + } + + public final MPJLambdaWrapper selectAll(Class clazz) { + TableInfo info = TableInfoHelper.getTableInfo(clazz); + Assert.notNull(info, "table can not be find -> %s", clazz); + if (info.havePK()) { + selectColumns.add(new SelectColumn(clazz, info.getKeyColumn(), null)); + } + info.getFieldList().forEach(c -> + selectColumns.add(new SelectColumn(clazz, c.getColumn(), null))); + return typedThis; + } + + /** + * 忽略查询字段 + *

+ * 用法: selectIgnore(UserDO::getId,UserDO::getSex) + * 注意: 一个selectIgnore只支持一个对象 如果要忽略多个实体的字段,请调用多次 + *

+ * .selectIgnore(UserDO::getId,UserDO::getSex) + * .selectIgnore(UserAddressDO::getArea,UserAddressDO::getCity) + * + * @since 1.1.3 + */ + @SafeVarargs + public final MPJLambdaWrapper selectIgnore(SFunction... columns) { + if (ArrayUtils.isNotEmpty(columns)) { + for (SFunction s : columns) { + ignoreColumns.add(new SelectColumn(LambdaUtils.getEntityClass(s), LambdaUtils.getColumn(s), null)); + } + } + return typedThis; + } + + @Override + public String getSqlSelect() { + if (StringUtils.isBlank(sqlSelect.getStringValue())) { + if (CollectionUtils.isNotEmpty(ignoreColumns)) { + selectColumns.removeIf(c -> ignoreColumns.stream().anyMatch(i -> + i.getClazz() == c.getClazz() && Objects.equals(c.getColumnName(), i.getColumnName()))); + } + String s = selectColumns.stream().map(i -> + Constant.TABLE_ALIAS + getDefault(subTable.get(i.getClazz())) + StringPool.DOT + i.getColumnName() + + (StringUtils.isBlank(i.getAlias()) ? StringPool.EMPTY : (Constant.AS + i.getAlias()))) + .collect(Collectors.joining(StringPool.COMMA)); + sqlSelect.setStringValue(s); + } + return sqlSelect.getStringValue(); + } + + + public String getFrom() { + return from.getStringValue(); + } + + public String getAlias() { + return alias.getStringValue(); + } + + /** + * 用于生成嵌套 sql + *

故 sqlSelect 不向下传递

+ */ + @Override + protected MPJLambdaWrapper instance() { + return new MPJLambdaWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs, + new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(), + this.subTable); + } + + @Override + public void clear() { + super.clear(); + sqlSelect.toNull(); + } + + @Override + public MPJLambdaWrapper join(String keyWord, boolean condition, Class clazz, SFunction left, SFunction right) { + if (condition) { + subTable.put(clazz, tableIndex); + TableInfo leftInfo = TableInfoHelper.getTableInfo(clazz); + StringBuilder sb = new StringBuilder(keyWord) + .append(leftInfo.getTableName()) + .append(Constant.SPACE_TABLE_ALIAS) + .append(tableIndex) + .append(Constant.ON_TABLE_ALIAS) + .append(tableIndex) + .append(StringPool.DOT) + .append(LambdaUtils.getColumn(left)) + .append(Constant.EQUALS_TABLE_ALIAS) + .append(getDefault(subTable.get(LambdaUtils.getEntityClass(right)))) + .append(StringPool.DOT) + .append(LambdaUtils.getColumn(right)); + tableIndex++; + if (StringUtils.isBlank(from.getStringValue())) { + from.setStringValue(sb.toString()); + } else { + from.setStringValue(from.getStringValue() + sb.toString()); + } + } + return typedThis; + } + + /** + * select字段 + */ + public static class SelectColumn { + + private Class clazz; + + private String columnName; + + private String alias; + + public SelectColumn(Class clazz, String columnName, String alias) { + this.clazz = clazz; + this.columnName = columnName; + this.alias = alias; + } + + public Class getClazz() { + return clazz; + } + + public void setClazz(Class clazz) { + this.clazz = clazz; + } + + public String getColumnName() { + return columnName; + } + + public void setColumnName(String columnName) { + this.columnName = columnName; + } + + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } + } +} diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories index de52160..37270fe 100644 --- a/src/main/resources/META-INF/spring.factories +++ b/src/main/resources/META-INF/spring.factories @@ -1,3 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.github.yulichang.interceptor.MPJInterceptor,\ - com.github.yulichang.injector.MPJSqlInjector + com.github.yulichang.injector.MPJSqlInjector,\ + com.github.yulichang.config.InterceptorConfig