admin 2021-03-25 18:01:16 +08:00
parent 0cb8b7cad9
commit 99dc3b0f9c
5 changed files with 214 additions and 212 deletions

View File

@ -17,31 +17,20 @@ import static java.util.stream.Collectors.joining;
/** /**
* copy {@link com.baomidou.mybatisplus.core.conditions.AbstractLambdaWrapper} * copy {@link com.baomidou.mybatisplus.core.conditions.AbstractLambdaWrapper}
*
* @author yulichang
*/ */
@SuppressWarnings("serial") @SuppressWarnings("serial")
public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstractLambdaWrapper<T, Children>> public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstractLambdaWrapper<T, Children>>
extends JoinAbstractWrapper<T, Children> { extends JoinAbstractWrapper<T, Children> {
private Map<String, ColumnCache> columnMap = null;
private boolean initColumnMap = false;
protected final Map<Class<?>, String> subTable = new HashMap<>(); protected final Map<Class<?>, String> subTable = new HashMap<>();
@SuppressWarnings("unchecked")
protected <X> String columnsToString(SFunction<X, ?>... columns) {
return columnsToString(true, columns);
}
@Override @Override
protected <X> String columnToString(X column) { protected <X> String columnToString(X column) {
return columnToString((SFunction<?, ?>) column, true); return columnToString((SFunction<?, ?>) column, true);
} }
@SuppressWarnings("unchecked")
protected <X> String columnsToString(boolean onlyColumn, SFunction<X, ?>... columns) {
return Arrays.stream(columns).map(i -> columnToString(i, onlyColumn)).collect(joining(StringPool.COMMA));
}
@Override @Override
protected <X> String columnsToString(X... columns) { protected <X> String columnsToString(X... columns) {
return Arrays.stream(columns).map(i -> columnToString((SFunction<?, ?>) i, true)).collect(joining(StringPool.COMMA)); return Arrays.stream(columns).map(i -> columnToString((SFunction<?, ?>) i, true)).collect(joining(StringPool.COMMA));

View File

@ -29,6 +29,8 @@ import static java.util.stream.Collectors.joining;
/** /**
* copy {@link com.baomidou.mybatisplus.core.conditions.AbstractWrapper} * copy {@link com.baomidou.mybatisplus.core.conditions.AbstractWrapper}
*
* @author yulichang
*/ */
@SuppressWarnings({"serial", "unchecked"}) @SuppressWarnings({"serial", "unchecked"})
public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrapper<T, Children>> extends Wrapper<T> public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrapper<T, Children>> extends Wrapper<T>

View File

@ -8,29 +8,32 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.baomidou.mybatisplus.core.toolkit.ArrayUtils; import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.github.yulichang.query.interfaces.MPJJoin; import com.github.yulichang.query.interfaces.MPJJoin;
import com.github.yulichang.toolkit.Constant; import com.github.yulichang.toolkit.Constant;
import com.github.yulichang.toolkit.LambdaUtils;
import org.springframework.util.Assert;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* copy {@link com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper} * 不推荐使用这wrapper
* 这种既有string又有lambda对开发人员并不友好
* <p>
* 推荐使用以下两个类 :
* String -> {@link MPJQueryWrapper<T>}
* lambda -> {@link com.github.yulichang.wrapper.MPJJoinLambdaQueryWrapper<T>}
* <p> * <p>
* sqlSelect 由覆盖改为追加
* *
* @author yulichang * @author yulichang
*/ */
@SuppressWarnings("all") @Deprecated
public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambdaQueryWrapper<T>> public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambdaQueryWrapper<T>>
implements Query<MPJLambdaQueryWrapper<T>, T, SFunction<T, ?>>, MPJJoin<MPJLambdaQueryWrapper<T>> { implements Query<MPJLambdaQueryWrapper<T>, T, SFunction<T, ?>>, MPJJoin<MPJLambdaQueryWrapper<T>> {
@ -49,27 +52,20 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
*/ */
private final SharedString alias = new SharedString(Constant.TABLE_ALIAS); private final SharedString alias = new SharedString(Constant.TABLE_ALIAS);
/**
* 查询的列
*/
private List<String> selectColumns = new ArrayList<>();
/**
* 排除的字段
*/
private List<String> ignoreColumns = new ArrayList<>();
/** /**
* 不建议直接 new 该实例使用 Wrappers.lambdaQuery(entity) * 不建议直接 new 该实例使用 Wrappers.lambdaQuery(entity)
*/ */
public MPJLambdaQueryWrapper() { public MPJLambdaQueryWrapper() {
this((T) null);
}
/**
* 不建议直接 new 该实例使用 Wrappers.lambdaQuery(entity)
*/
public MPJLambdaQueryWrapper(T entity) {
super.setEntity(entity);
super.initNeed();
}
/**
* 不建议直接 new 该实例使用 Wrappers.lambdaQuery(entity)
*/
public MPJLambdaQueryWrapper(Class<T> entityClass) {
super.setEntityClass(entityClass);
super.initNeed(); super.initNeed();
} }
@ -78,7 +74,8 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
*/ */
MPJLambdaQueryWrapper(T entity, Class<T> entityClass, SharedString from, SharedString sqlSelect, AtomicInteger paramNameSeq, MPJLambdaQueryWrapper(T entity, Class<T> entityClass, SharedString from, SharedString sqlSelect, AtomicInteger paramNameSeq,
Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments, Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
SharedString lastSql, SharedString sqlComment, SharedString sqlFirst) { SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
List<String> selectColumns, List<String> ignoreColumns) {
super.setEntity(entity); super.setEntity(entity);
super.setEntityClass(entityClass); super.setEntityClass(entityClass);
this.paramNameSeq = paramNameSeq; this.paramNameSeq = paramNameSeq;
@ -89,6 +86,8 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
this.lastSql = lastSql; this.lastSql = lastSql;
this.sqlComment = sqlComment; this.sqlComment = sqlComment;
this.sqlFirst = sqlFirst; this.sqlFirst = sqlFirst;
this.selectColumns = selectColumns;
this.ignoreColumns = ignoreColumns;
} }
/** /**
@ -97,19 +96,41 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
* @param columns 查询字段 * @param columns 查询字段
*/ */
@SafeVarargs @SafeVarargs
@Override
public final MPJLambdaQueryWrapper<T> select(SFunction<T, ?>... columns) { public final MPJLambdaQueryWrapper<T> select(SFunction<T, ?>... columns) {
return select(true, columns); if (ArrayUtils.isNotEmpty(columns)) {
for (SFunction<T, ?> s : columns) {
selectColumns.add(columnToString(s, false));
}
}
return typedThis;
} }
/**
* 忽略查询字段
* <p>
* 用法: selectIgnore("t.id","t.sex","a.area")
*
* @since 1.1.3
*/
public MPJLambdaQueryWrapper<T> selectIgnore(String... columns) {
if (ArrayUtils.isNotEmpty(columns)) {
ignoreColumns.addAll(Arrays.asList(columns));
}
return typedThis;
}
/**
* 忽略查询字段
* <p>
* 用法: selectIgnore("t.id","t.sex","a.area")
*
* @since 1.1.3
*/
@SafeVarargs @SafeVarargs
public final MPJLambdaQueryWrapper<T> select(boolean condition, SFunction<T, ?>... columns) { public final MPJLambdaQueryWrapper<T> selectIgnore(SFunction<T, ?>... columns) {
if (condition && ArrayUtils.isNotEmpty(columns)) { if (ArrayUtils.isNotEmpty(columns)) {
String s = columnsToString(false, columns); for (SFunction<T, ?> s : columns) {
if (StringUtils.isBlank(sqlSelect.getStringValue())) { ignoreColumns.add(Constant.TABLE_ALIAS + StringPool.DOT + LambdaUtils.getColumn(s));
this.sqlSelect.setStringValue(s);
} else {
this.sqlSelect.setStringValue(this.getSqlSelect() + StringPool.COMMA + s);
} }
} }
return typedThis; return typedThis;
@ -120,25 +141,16 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
return Constant.TABLE_ALIAS + StringPool.DOT + super.columnToString(column, onlyColumn); return Constant.TABLE_ALIAS + StringPool.DOT + super.columnToString(column, onlyColumn);
} }
@SafeVarargs public MPJLambdaQueryWrapper<T> select(String... columns) {
public final MPJLambdaQueryWrapper<T> select(String... columns) { if (ArrayUtils.isNotEmpty(columns)) {
return select(true, columns); Collections.addAll(selectColumns, columns);
}
@SafeVarargs
public final MPJLambdaQueryWrapper<T> select(boolean condition, String... columns) {
if (condition && ArrayUtils.isNotEmpty(columns)) {
String s = String.join(StringPool.COMMA, columns);
if (StringUtils.isBlank(sqlSelect.getStringValue())) {
this.sqlSelect.setStringValue(s);
} else {
this.sqlSelect.setStringValue(this.getSqlSelect() + StringPool.COMMA + s);
}
} }
return typedThis; return typedThis;
} }
/** /**
* 只针对主表
* <p>
* 过滤查询的字段信息(主键除外!) * 过滤查询的字段信息(主键除外!)
* <p>例1: 只要 java 字段名以 "test" 开头的 -> select(i -&gt; i.getProperty().startsWith("test"))</p> * <p>例1: 只要 java 字段名以 "test" 开头的 -> select(i -&gt; i.getProperty().startsWith("test"))</p>
* <p>例2: 只要 java 字段属性是 CharSequence 类型的 -> select(TableFieldInfo::isCharSequence)</p> * <p>例2: 只要 java 字段属性是 CharSequence 类型的 -> select(TableFieldInfo::isCharSequence)</p>
@ -151,48 +163,37 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
*/ */
@Override @Override
public MPJLambdaQueryWrapper<T> select(Class<T> entityClass, Predicate<TableFieldInfo> predicate) { public MPJLambdaQueryWrapper<T> select(Class<T> entityClass, Predicate<TableFieldInfo> predicate) {
return select(true, entityClass, predicate); TableInfo info = TableInfoHelper.getTableInfo(entityClass);
} Assert.notNull(info, "can not find table info");
selectColumns.addAll(info.getFieldList().stream().filter(predicate).map(c ->
public MPJLambdaQueryWrapper<T> select(boolean condition, Class<T> entityClass, Predicate<TableFieldInfo> predicate) { Constant.TABLE_ALIAS + StringPool.DOT + c.getColumn()).collect(Collectors.toList()));
if (condition) {
if (entityClass == null) {
entityClass = getEntityClass();
} else {
setEntityClass(entityClass);
}
Assert.notNull(entityClass, "entityClass can not be null");
String s = TableInfoHelper.getTableInfo(entityClass).chooseSelect(predicate);
List<String> list = Arrays.stream(s.split(StringPool.COMMA)).map(i -> Constant.TABLE_ALIAS + StringPool.DOT + i).collect(Collectors.toList());
String join = String.join(StringPool.COMMA, list);
if (StringUtils.isBlank(sqlSelect.getStringValue())) {
this.sqlSelect.setStringValue(join);
} else {
this.sqlSelect.setStringValue(this.getSqlSelect() + StringPool.COMMA + join);
}
}
return typedThis; return typedThis;
} }
/**
* 查询主表全部字段
*
* @param clazz 主表class
*/
public final MPJLambdaQueryWrapper<T> selectAll(Class<T> clazz) { public final MPJLambdaQueryWrapper<T> selectAll(Class<T> clazz) {
return selectAll(true, clazz); return selectAll(clazz, Constant.TABLE_ALIAS);
} }
public final MPJLambdaQueryWrapper<T> selectAll(boolean condition, Class<T> clazz) { /**
if (condition) { * 查询表全部字段
TableInfo info = TableInfoHelper.getTableInfo(clazz); *
List<String> list = new ArrayList<>(); * @param clazz 表实体
if (info.havePK()) { * @param as 表别名
list.add(Constant.TABLE_ALIAS + StringPool.DOT + info.getKeyColumn()); */
} public final MPJLambdaQueryWrapper<T> selectAll(Class<?> clazz, String as) {
list.addAll(info.getFieldList().stream().map(i -> Constant.TABLE_ALIAS + StringPool.DOT + i.getColumn()).collect(Collectors.toList())); TableInfo info = TableInfoHelper.getTableInfo(clazz);
String join = String.join(StringPool.COMMA, list); Assert.notNull(info, "can not find table info");
if (StringUtils.isBlank(sqlSelect.getStringValue())) { if (info.havePK()) {
this.sqlSelect.setStringValue(join); selectColumns.add(as + StringPool.DOT + info.getKeyColumn());
} else {
this.sqlSelect.setStringValue(this.getSqlSelect() + StringPool.COMMA + join);
}
} }
selectColumns.addAll(info.getFieldList().stream().map(i ->
as + StringPool.DOT + i.getColumn()).collect(Collectors.toList()));
return typedThis; return typedThis;
} }
@ -201,11 +202,17 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
*/ */
public MPJQueryWrapper<T> stringQuery() { public MPJQueryWrapper<T> stringQuery() {
return new MPJQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs, return new MPJQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs,
expression, sqlSelect, from, lastSql, sqlComment, sqlFirst); expression, sqlSelect, from, lastSql, sqlComment, sqlFirst, selectColumns, ignoreColumns);
} }
@Override @Override
public String getSqlSelect() { public String getSqlSelect() {
if (StringUtils.isBlank(sqlSelect.getStringValue())) {
if (CollectionUtils.isNotEmpty(ignoreColumns)) {
selectColumns.removeIf(ignoreColumns::contains);
}
sqlSelect.setStringValue(String.join(StringPool.COMMA, selectColumns));
}
return sqlSelect.getStringValue(); return sqlSelect.getStringValue();
} }
@ -220,12 +227,12 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
/** /**
* 用于生成嵌套 sql * 用于生成嵌套 sql
* <p> sqlSelect from不向下传递</p> * <p> sqlSelect selectColumn ignoreColumns from不向下传递</p>
*/ */
@Override @Override
protected MPJLambdaQueryWrapper<T> instance() { protected MPJLambdaQueryWrapper<T> instance() {
return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, null, paramNameSeq, paramNameValuePairs, return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, null, paramNameSeq, paramNameValuePairs,
new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString()); new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(), null, null);
} }
@Override @Override

View File

@ -8,12 +8,15 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.baomidou.mybatisplus.core.toolkit.ArrayUtils; import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.yulichang.query.interfaces.MPJJoin; import com.github.yulichang.query.interfaces.MPJJoin;
import com.github.yulichang.toolkit.Constant; import com.github.yulichang.toolkit.Constant;
import org.springframework.util.Assert;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -25,7 +28,6 @@ import java.util.stream.Collectors;
* *
* @author yulichang * @author yulichang
*/ */
@SuppressWarnings("serial")
public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapper<T>> public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapper<T>>
implements Query<MPJQueryWrapper<T>, T, String>, MPJJoin<MPJQueryWrapper<T>> { implements Query<MPJQueryWrapper<T>, T, String>, MPJJoin<MPJQueryWrapper<T>> {
@ -44,22 +46,21 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
*/ */
private final SharedString alias = new SharedString(Constant.TABLE_ALIAS); private final SharedString alias = new SharedString(Constant.TABLE_ALIAS);
/**
* 查询的列
*/
private List<String> selectColumns = new ArrayList<>();
/**
* 排除的字段
*/
private List<String> ignoreColumns = new ArrayList<>();
public MPJQueryWrapper() { public MPJQueryWrapper() {
this(null);
}
public MPJQueryWrapper(T entity) {
super.setEntity(entity);
super.initNeed(); super.initNeed();
} }
public MPJQueryWrapper(T entity, String... columns) {
super.setEntity(entity);
super.initNeed();
this.select(columns);
}
/** /**
* 非对外公开的构造方法,只用于生产嵌套 sql * 非对外公开的构造方法,只用于生产嵌套 sql
* *
@ -67,7 +68,9 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
*/ */
public MPJQueryWrapper(T entity, Class<T> entityClass, AtomicInteger paramNameSeq, public MPJQueryWrapper(T entity, Class<T> entityClass, AtomicInteger paramNameSeq,
Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments, Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
SharedString sqlSelect, SharedString from, SharedString lastSql, SharedString sqlComment, SharedString sqlFirst) { SharedString sqlSelect, SharedString from, SharedString lastSql,
SharedString sqlComment, SharedString sqlFirst,
List<String> selectColumns, List<String> ignoreColumns) {
super.setEntity(entity); super.setEntity(entity);
super.setEntityClass(entityClass); super.setEntityClass(entityClass);
this.paramNameSeq = paramNameSeq; this.paramNameSeq = paramNameSeq;
@ -78,60 +81,83 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
this.from = from; this.from = from;
this.sqlComment = sqlComment; this.sqlComment = sqlComment;
this.sqlFirst = sqlFirst; this.sqlFirst = sqlFirst;
this.selectColumns = selectColumns;
this.ignoreColumns = ignoreColumns;
} }
@Override @Override
public MPJQueryWrapper<T> select(String... columns) { public MPJQueryWrapper<T> select(String... columns) {
return select(true, columns); if (ArrayUtils.isNotEmpty(columns)) {
} selectColumns.addAll(Arrays.asList(columns));
public MPJQueryWrapper<T> select(boolean condition, String... columns) {
if (condition) {
if (ArrayUtils.isNotEmpty(columns)) {
this.sqlSelect.setStringValue(String.join(StringPool.COMMA, columns));
}
} }
return typedThis; return typedThis;
} }
/**
* 忽略查询字段
* <p>
* 用法: selectIgnore("t.id","t.sex","a.area")
*
* @since 1.1.3
*/
public MPJQueryWrapper<T> selectIgnore(String... columns) {
if (ArrayUtils.isNotEmpty(columns)) {
ignoreColumns.addAll(Arrays.asList(columns));
}
return typedThis;
}
/**
* 此方法只能用于主表
* 不好含主键
*
* @param entityClass 主表class
* @param predicate 条件lambda
*/
@Override @Override
public MPJQueryWrapper<T> select(Class<T> entityClass, Predicate<TableFieldInfo> predicate) { public MPJQueryWrapper<T> select(Class<T> entityClass, Predicate<TableFieldInfo> predicate) {
return select(true, entityClass, predicate); TableInfo info = TableInfoHelper.getTableInfo(entityClass);
} Assert.notNull(info, "can not find table info");
selectColumns.addAll(info.getFieldList().stream().filter(predicate).map(c ->
public MPJQueryWrapper<T> select(boolean condition, Class<T> entityClass, Predicate<TableFieldInfo> predicate) { Constant.TABLE_ALIAS + StringPool.DOT + c.getColumn()).collect(Collectors.toList()));
if (condition) {
super.setEntityClass(entityClass);
this.sqlSelect.setStringValue(TableInfoHelper.getTableInfo(getEntityClass()).chooseSelect(predicate));
}
return typedThis; return typedThis;
} }
/**
* 查询主表全部字段
*
* @param clazz 主表class
*/
public final MPJQueryWrapper<T> selectAll(Class<T> clazz) { public final MPJQueryWrapper<T> selectAll(Class<T> clazz) {
return selectAll(true, clazz); selectAll(clazz, Constant.TABLE_ALIAS);
return typedThis;
} }
public final MPJQueryWrapper<T> selectAll(boolean condition, Class<T> clazz) { /**
if (condition) { * 查询指定实体全部字段
TableInfo info = TableInfoHelper.getTableInfo(clazz); *
List<String> list = new ArrayList<>(); * @param as 实体对应的别名
if (info.havePK()) { */
list.add(Constant.TABLE_ALIAS + StringPool.DOT + info.getKeyColumn()); public final MPJQueryWrapper<T> selectAll(Class<?> clazz, String as) {
} TableInfo info = TableInfoHelper.getTableInfo(clazz);
list.addAll(info.getFieldList().stream().map(i -> Constant.TABLE_ALIAS + StringPool.DOT + i.getColumn()).collect(Collectors.toList())); Assert.notNull(info, "can not find table info");
String join = String.join(StringPool.COMMA, list); if (info.havePK()) {
if (StringUtils.isBlank(sqlSelect.getStringValue())) { selectColumns.add(as + StringPool.DOT + info.getKeyColumn());
this.sqlSelect.setStringValue(join);
} else {
this.sqlSelect.setStringValue(this.getSqlSelect() + StringPool.COMMA + join);
}
} }
selectColumns.addAll(info.getFieldList().stream().map(i ->
as + StringPool.DOT + i.getColumn()).collect(Collectors.toList()));
return typedThis; return typedThis;
} }
@Override @Override
public String getSqlSelect() { public String getSqlSelect() {
if (StringUtils.isBlank(sqlSelect.getStringValue())) {
if (CollectionUtils.isNotEmpty(ignoreColumns)) {
selectColumns.removeIf(ignoreColumns::contains);
}
sqlSelect.setStringValue(String.join(StringPool.COMMA, selectColumns));
}
return sqlSelect.getStringValue(); return sqlSelect.getStringValue();
} }
@ -149,19 +175,17 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
*/ */
public MPJLambdaQueryWrapper<T> lambda() { public MPJLambdaQueryWrapper<T> lambda() {
return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), from, sqlSelect, paramNameSeq, paramNameValuePairs, return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), from, sqlSelect, paramNameSeq, paramNameValuePairs,
expression, lastSql, sqlComment, sqlFirst); expression, lastSql, sqlComment, sqlFirst, selectColumns, ignoreColumns);
} }
/** /**
* 用于生成嵌套 sql * 用于生成嵌套 sql
* <p> * <p> sqlSelect selectColumn ignoreColumns from不向下传递</p>
* sqlSelect from 不向下传递
* </p>
*/ */
@Override @Override
protected MPJQueryWrapper<T> instance() { protected MPJQueryWrapper<T> instance() {
return new MPJQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs, new MergeSegments(), return new MPJQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs, new MergeSegments(),
null, null, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString()); null, null, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(), null, null);
} }
@Override @Override

View File

@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.baomidou.mybatisplus.core.toolkit.ArrayUtils; import com.baomidou.mybatisplus.core.toolkit.*;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.github.yulichang.toolkit.Constant; import com.github.yulichang.toolkit.Constant;
import com.github.yulichang.toolkit.LambdaUtils; import com.github.yulichang.toolkit.LambdaUtils;
@ -18,6 +15,7 @@ import com.github.yulichang.wrapper.interfaces.SFunctionQuery;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -51,31 +49,20 @@ public class MPJJoinLambdaQueryWrapper<T> extends MPJAbstractLambdaWrapper<T, MP
*/ */
private final List<SelectColumn> selectColumns = new ArrayList<>(); private final List<SelectColumn> selectColumns = new ArrayList<>();
/**
* 忽略查询的字段
*/
private final List<SelectColumn> ignoreColumns = new ArrayList<>();
/** /**
* 表序号 * 表序号
*/ */
private int tableIndex = 1; private int tableIndex = 1;
/** /**
* 不建议直接 new 该实例使用 Wrappers.lambdaQuery(entity) * 不建议直接 new 该实例使用 Wrappers.lambdaQuery()
*/ */
public MPJJoinLambdaQueryWrapper() { public MPJJoinLambdaQueryWrapper() {
this((T) null);
}
/**
* 不建议直接 new 该实例使用 Wrappers.lambdaQuery(entity)
*/
public MPJJoinLambdaQueryWrapper(T entity) {
super.setEntity(entity);
super.initNeed();
}
/**
* 不建议直接 new 该实例使用 Wrappers.lambdaQuery(entity)
*/
public MPJJoinLambdaQueryWrapper(Class<T> entityClass) {
super.setEntityClass(entityClass);
super.initNeed(); super.initNeed();
} }
@ -103,12 +90,7 @@ public class MPJJoinLambdaQueryWrapper<T> extends MPJAbstractLambdaWrapper<T, MP
*/ */
@SafeVarargs @SafeVarargs
public final <S> MPJJoinLambdaQueryWrapper<T> select(SFunction<S, ?>... columns) { public final <S> MPJJoinLambdaQueryWrapper<T> select(SFunction<S, ?>... columns) {
return select(true, columns); if (ArrayUtils.isNotEmpty(columns)) {
}
@SafeVarargs
public final <S> MPJJoinLambdaQueryWrapper<T> select(boolean condition, SFunction<S, ?>... columns) {
if (condition && ArrayUtils.isNotEmpty(columns)) {
for (SFunction<S, ?> s : columns) { for (SFunction<S, ?> s : columns) {
selectColumns.add(new SelectColumn(LambdaUtils.getEntityClass(s), LambdaUtils.getColumn(s), null)); selectColumns.add(new SelectColumn(LambdaUtils.getEntityClass(s), LambdaUtils.getColumn(s), null));
} }
@ -116,60 +98,54 @@ public class MPJJoinLambdaQueryWrapper<T> extends MPJAbstractLambdaWrapper<T, MP
return typedThis; return typedThis;
} }
@Override
public <E> MPJJoinLambdaQueryWrapper<T> select(Class<E> entityClass, Predicate<TableFieldInfo> predicate) { public <E> MPJJoinLambdaQueryWrapper<T> select(Class<E> entityClass, Predicate<TableFieldInfo> predicate) {
return select(true, entityClass, predicate); TableInfo info = TableInfoHelper.getTableInfo(entityClass);
} Assert.notNull(info, "table can not be find");
info.getFieldList().stream().filter(predicate).collect(Collectors.toList()).forEach(
public <E> MPJJoinLambdaQueryWrapper<T> select(boolean condition, Class<E> entityClass, Predicate<TableFieldInfo> predicate) { i -> selectColumns.add(new SelectColumn(entityClass, i.getColumn(), null)));
if (condition) {
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; return typedThis;
} }
public final <S, X> MPJJoinLambdaQueryWrapper<T> selectAs(SFunction<S, ?> columns, SFunction<X, ?> alias) { public final <S, X> MPJJoinLambdaQueryWrapper<T> selectAs(SFunction<S, ?> columns, SFunction<X, ?> alias) {
return selectAs(true, columns, LambdaUtils.getName(alias)); return selectAs(columns, LambdaUtils.getName(alias));
} }
/** /**
* @since 1.1.3 * @since 1.1.3
*/ */
public final <S> MPJJoinLambdaQueryWrapper<T> selectAs(SFunction<S, ?> columns, String alias) { public final <S, X> MPJJoinLambdaQueryWrapper<T> selectAs(SFunction<S, ?> columns, String alias) {
return selectAs(true, columns, alias); selectColumns.add(new SelectColumn(LambdaUtils.getEntityClass(columns), LambdaUtils.getColumn(columns), alias));
}
public final <S, X> MPJJoinLambdaQueryWrapper<T> selectAs(boolean condition, SFunction<S, ?> columns, SFunction alias) {
return selectAs(condition, columns, LambdaUtils.getName(alias));
}
/**
* @since 1.1.3
*/
public final <S, X> MPJJoinLambdaQueryWrapper<T> selectAs(boolean condition, SFunction<S, ?> columns, String alias) {
if (condition) {
selectColumns.add(new SelectColumn(LambdaUtils.getEntityClass(columns), LambdaUtils.getColumn(columns), alias));
}
return typedThis; return typedThis;
} }
public final MPJJoinLambdaQueryWrapper<T> selectAll(Class<?> clazz) { public final MPJJoinLambdaQueryWrapper<T> selectAll(Class<?> clazz) {
return selectAll(true, 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;
} }
public final MPJJoinLambdaQueryWrapper<T> selectAll(boolean condition, Class<?> clazz) { /**
if (condition) { * 忽略查询字段
TableInfo info = TableInfoHelper.getTableInfo(clazz); * <p>
Assert.notNull(info, "table can not be find -> %s", clazz); * 用法: selectIgnore(UserDO::getId,UserDO::getSex)
if (info.havePK()) { * 注意: 一个selectIgnore只支持一个对象 如果要忽略多个实体的字段,请调用多次
selectColumns.add(new SelectColumn(clazz, info.getKeyColumn(), null)); * <p>
* .selectIgnore(UserDO::getId,UserDO::getSex)
* .selectIgnore(UserAddressDO::getArea,UserAddressDO::getCity)
*
* @since 1.1.3
*/
@SafeVarargs
public final <S> MPJJoinLambdaQueryWrapper<T> selectIgnore(SFunction<S, ?>... columns) {
if (ArrayUtils.isNotEmpty(columns)) {
for (SFunction<S, ?> s : columns) {
ignoreColumns.add(new SelectColumn(LambdaUtils.getEntityClass(s), LambdaUtils.getColumn(s), null));
} }
info.getFieldList().forEach(c ->
selectColumns.add(new SelectColumn(clazz, c.getColumn(), null)));
} }
return typedThis; return typedThis;
} }
@ -177,6 +153,10 @@ public class MPJJoinLambdaQueryWrapper<T> extends MPJAbstractLambdaWrapper<T, MP
@Override @Override
public String getSqlSelect() { public String getSqlSelect() {
if (StringUtils.isBlank(sqlSelect.getStringValue())) { 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 -> String s = selectColumns.stream().map(i ->
Constant.TABLE_ALIAS + getDefault(subTable.get(i.getClazz())) + StringPool.DOT + i.getColumnName() + Constant.TABLE_ALIAS + getDefault(subTable.get(i.getClazz())) + StringPool.DOT + i.getColumnName() +
(StringUtils.isBlank(i.getAlias()) ? StringPool.EMPTY : (Constant.AS + i.getAlias()))) (StringUtils.isBlank(i.getAlias()) ? StringPool.EMPTY : (Constant.AS + i.getAlias())))