完善代码注释

This commit is contained in:
admin 2021-06-07 11:07:34 +08:00
parent 4b44ee2afe
commit aa87090997
2 changed files with 69 additions and 35 deletions

View File

@ -113,11 +113,6 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
this.joinClass = joinClass;
}
/**
* SELECT 部分 SQL 设置
*
* @param columns 查询字段
*/
@Override
@SafeVarargs
public final <S> MPJLambdaWrapper<T> select(SFunction<S, ?>... columns) {
@ -166,17 +161,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
return typedThis;
}
/**
* 忽略查询字段
* <p>
* 用法: selectIgnore(UserDO::getId,UserDO::getSex)
* 注意: 一个selectIgnore只支持一个对象 如果要忽略多个实体的字段,请调用多次
* <p>
* .selectIgnore(UserDO::getId,UserDO::getSex)
* .selectIgnore(UserAddressDO::getArea,UserAddressDO::getCity)
*
* @since 1.1.3
*/
@Override
@SafeVarargs
public final <S> MPJLambdaWrapper<T> selectIgnore(SFunction<S, ?>... columns) {
if (ArrayUtils.isNotEmpty(columns)) {
@ -273,14 +258,31 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
@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;
@ -289,11 +291,11 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
}
public static SelectColumn of(Class<?> clazz, String columnName) {
return of(clazz, columnName, null, null);
return new SelectColumn(clazz, columnName, null, null);
}
public static SelectColumn of(Class<?> clazz, String columnName, String alias) {
return of(clazz, columnName, alias, null);
return new SelectColumn(clazz, columnName, alias, null);
}
public static SelectColumn of(Class<?> clazz, String columnName, String alias, BaseFuncEnum funcEnum) {

View File

@ -39,8 +39,11 @@ public interface Query<Children> extends Serializable {
*/
<E> Children select(Class<E> entityClass, Predicate<TableFieldInfo> predicate);
default <S, X> Children selectAs(SFunction<S, ?> columns, SFunction<X, ?> alias) {
return selectAs(columns, LambdaUtils.getName(alias));
/**
* ignore
*/
default <S, X> Children selectAs(SFunction<S, ?> column, SFunction<X, ?> alias) {
return selectAs(column, LambdaUtils.getName(alias));
}
/**
@ -48,6 +51,31 @@ public interface Query<Children> extends Serializable {
*/
<S> Children selectAs(SFunction<S, ?> column, String alias);
/**
* ignore
*/
<S> Children selectFunc(BaseFuncEnum funcEnum, SFunction<S, ?> column, String alias);
/**
* ignore
*/
default <S> Children selectFunc(BaseFuncEnum funcEnum, SFunction<S, ?> column) {
return selectFunc(funcEnum, column, column);
}
/**
* ignore
*/
default <S, X> Children selectFunc(BaseFuncEnum funcEnum, SFunction<S, ?> column, SFunction<X, ?> alias) {
return selectFunc(funcEnum, column, LambdaUtils.getName(alias));
}
/**
* ignore
*/
default <X> Children selectFunc(BaseFuncEnum funcEnum, Object column, SFunction<X, ?> alias) {
return selectFunc(funcEnum, column, LambdaUtils.getName(alias));
}
/**
* 聚合函数查询
@ -56,23 +84,27 @@ public interface Query<Children> extends Serializable {
* @param column 函数作用的字段
* @param alias 别名
*/
<S> Children selectFunc(BaseFuncEnum funcEnum, SFunction<S, ?> column, String alias);
default <S> Children selectFunc(BaseFuncEnum funcEnum, SFunction<S, ?> column) {
return selectFunc(funcEnum, column, column);
}
default <S, X> Children selectFunc(BaseFuncEnum funcEnum, SFunction<S, ?> column, SFunction<X, ?> alias) {
return selectFunc(funcEnum, column, LambdaUtils.getName(alias));
}
default <X> Children selectFunc(BaseFuncEnum funcEnum, Object column, SFunction<X, ?> alias) {
return selectFunc(funcEnum, column, LambdaUtils.getName(alias));
}
Children selectFunc(BaseFuncEnum funcEnum, Object column, String alias);
/**
* 忽略查询字段
* <p>
* 用法: selectIgnore(UserDO::getId,UserDO::getSex)
* 注意: 一个selectIgnore只支持一个对象 如果要忽略多个实体的字段,请调用多次
* <p>
* .selectIgnore(UserDO::getId,UserDO::getSex)
* .selectIgnore(UserAddressDO::getArea,UserAddressDO::getCity)
*
* @since 1.1.3
*/
@SuppressWarnings("unchecked")
<S> Children selectIgnore(SFunction<S, ?>... columns);
/**
* 查询实体类全部字段
*/
Children selectAll(Class<?> clazz);
/**
* select sql 片段
*/