mirror of
https://gitee.com/best_handsome/mybatis-plus-join
synced 2025-07-11 00:02:22 +08:00
简化代码
This commit is contained in:
parent
7db13fd882
commit
de3504ed5e
@ -216,20 +216,16 @@ public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstract
|
|||||||
return decode;
|
return decode;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected <X> String columnToString(Integer index, String alias, X column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy) {
|
|
||||||
return columnToString(index, alias, (SFunction<?, ?>) column, isJoin, prefixEnum, orderBy);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SafeVarargs
|
@SafeVarargs
|
||||||
protected final <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns) {
|
protected final <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, SFunction<X, ?>... columns) {
|
||||||
return Arrays.stream(columns).map(i ->
|
return Arrays.stream(columns).map(i -> columnToString(index, alias, i, false, prefixEnum, false))
|
||||||
columnToString(index, alias, (SFunction<?, ?>) i, false, prefixEnum, false))
|
|
||||||
.collect(joining(StringPool.COMMA));
|
.collect(joining(StringPool.COMMA));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected String columnToString(Integer index, String alias, SFunction<?, ?> column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy) {
|
@Override
|
||||||
|
protected <X> String columnToString(Integer index, String alias, SFunction<X, ?> column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy) {
|
||||||
Class<?> entityClass = LambdaUtils.getEntityClass(column);
|
Class<?> entityClass = LambdaUtils.getEntityClass(column);
|
||||||
if (orderBy) {
|
if (orderBy) {
|
||||||
TableInfo info = TableHelper.get(entityClass);
|
TableInfo info = TableHelper.get(entityClass);
|
||||||
|
@ -881,9 +881,7 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
|
|||||||
/**
|
/**
|
||||||
* 获取 columnName
|
* 获取 columnName
|
||||||
*/
|
*/
|
||||||
protected <X> String columnToString(Integer index, String alias, X column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy) {
|
abstract protected <X> String columnToString(Integer index, String alias, SFunction<X, ?> column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy);
|
||||||
return (String) column;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected String columnToString(String column) {
|
protected String columnToString(String column) {
|
||||||
if (checkSqlInjection && MPJSqlInjectionUtils.check(column)) {
|
if (checkSqlInjection && MPJSqlInjectionUtils.check(column)) {
|
||||||
@ -906,11 +904,10 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
|
|||||||
*
|
*
|
||||||
* @param columns 多字段
|
* @param columns 多字段
|
||||||
*/
|
*/
|
||||||
abstract <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns);
|
abstract <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, SFunction<X, ?>... columns);
|
||||||
|
|
||||||
public <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, boolean orderBy, List<X> columns) {
|
public <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, boolean orderBy, List<X> columns) {
|
||||||
return columns.stream().map(i ->
|
return columns.stream().map(i -> columnToString(index, alias, (SFunction<?, ?>) i, false, prefixEnum, orderBy))
|
||||||
columnToString(index, alias, (SFunction<?, ?>) i, false, prefixEnum, orderBy))
|
|
||||||
.collect(joining(StringPool.COMMA));
|
.collect(joining(StringPool.COMMA));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,7 +66,6 @@
|
|||||||
<artifactId>flatten-maven-plugin</artifactId>
|
<artifactId>flatten-maven-plugin</artifactId>
|
||||||
<version>1.5.0</version>
|
<version>1.5.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- 是否更新pom文件,此处还有更高级的用法 -->
|
|
||||||
<updatePomFile>true</updatePomFile>
|
<updatePomFile>true</updatePomFile>
|
||||||
<flattenMode>resolveCiFriendliesOnly</flattenMode>
|
<flattenMode>resolveCiFriendliesOnly</flattenMode>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user