简化代码

This commit is contained in:
yulichang 2024-07-06 23:56:40 +08:00
parent 7db13fd882
commit de3504ed5e
3 changed files with 7 additions and 15 deletions

View File

@ -216,20 +216,16 @@ public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstract
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
@SafeVarargs
protected final <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns) {
return Arrays.stream(columns).map(i ->
columnToString(index, alias, (SFunction<?, ?>) i, false, prefixEnum, false))
protected final <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, SFunction<X, ?>... columns) {
return Arrays.stream(columns).map(i -> columnToString(index, alias, i, false, prefixEnum, false))
.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);
if (orderBy) {
TableInfo info = TableHelper.get(entityClass);

View File

@ -881,9 +881,7 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
/**
* 获取 columnName
*/
protected <X> String columnToString(Integer index, String alias, X column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy) {
return (String) column;
}
abstract protected <X> String columnToString(Integer index, String alias, SFunction<X, ?> column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy);
protected String columnToString(String column) {
if (checkSqlInjection && MPJSqlInjectionUtils.check(column)) {
@ -906,11 +904,10 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
*
* @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) {
return columns.stream().map(i ->
columnToString(index, alias, (SFunction<?, ?>) i, false, prefixEnum, orderBy))
return columns.stream().map(i -> columnToString(index, alias, (SFunction<?, ?>) i, false, prefixEnum, orderBy))
.collect(joining(StringPool.COMMA));
}

View File

@ -66,7 +66,6 @@
<artifactId>flatten-maven-plugin</artifactId>
<version>1.5.0</version>
<configuration>
<!-- 是否更新pom文件此处还有更高级的用法 -->
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>