lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2018-08-02 13:51:41 +08:00
parent 36d7fbf4e9
commit 15c97ddc18
2 changed files with 60 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/redkale/source/DataSqlSource.java
View File

@@ -890,22 +890,22 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
@Override
public <T> int updateColumn(final T bean, final String... columns) {
return updateColumn(bean, SelectColumn.createIncludes(columns));
return updateColumn(bean, SelectColumn.includes(columns));
}
@Override
public <T> CompletableFuture<Integer> updateColumnAsync(final T bean, final String... columns) {
return updateColumnAsync(bean, SelectColumn.createIncludes(columns));
return updateColumnAsync(bean, SelectColumn.includes(columns));
}
@Override
public <T> int updateColumn(final T bean, final FilterNode node, final String... columns) {
return updateColumn(bean, node, SelectColumn.createIncludes(columns));
return updateColumn(bean, node, SelectColumn.includes(columns));
}
@Override
public <T> CompletableFuture<Integer> updateColumnAsync(final T bean, final FilterNode node, final String... columns) {
return updateColumnAsync(bean, node, SelectColumn.createIncludes(columns));
return updateColumnAsync(bean, node, SelectColumn.includes(columns));
}
@Override
@@ -1717,7 +1717,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
@Override
public <T, V extends Serializable> List<V> queryColumnList(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
final List<T> list = queryList(clazz, SelectColumn.createIncludes(selectedColumn), flipper, node);
final List<T> list = queryList(clazz, SelectColumn.includes(selectedColumn), flipper, node);
final List<V> rs = new ArrayList<>();
if (list.isEmpty()) return rs;
final EntityInfo<T> info = loadEntityInfo(clazz);
@@ -1730,7 +1730,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
@Override
public <T, V extends Serializable> CompletableFuture<List<V>> queryColumnListAsync(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
return queryListAsync(clazz, SelectColumn.createIncludes(selectedColumn), flipper, node).thenApply((List<T> list) -> {
return queryListAsync(clazz, SelectColumn.includes(selectedColumn), flipper, node).thenApply((List<T> list) -> {
final List<V> rs = new ArrayList<>();
if (list.isEmpty()) return rs;
final EntityInfo<T> info = loadEntityInfo(clazz);
@@ -1766,7 +1766,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
@Override
public <T, V extends Serializable> Sheet<V> queryColumnSheet(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
Sheet<T> sheet = querySheet(clazz, SelectColumn.createIncludes(selectedColumn), flipper, node);
Sheet<T> sheet = querySheet(clazz, SelectColumn.includes(selectedColumn), flipper, node);
final Sheet<V> rs = new Sheet<>();
if (sheet.isEmpty()) return rs;
rs.setTotal(sheet.getTotal());
@@ -1782,7 +1782,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
@Override
public <T, V extends Serializable> CompletableFuture<Sheet<V>> queryColumnSheetAsync(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
return querySheetAsync(clazz, SelectColumn.createIncludes(selectedColumn), flipper, node).thenApply((Sheet<T> sheet) -> {
return querySheetAsync(clazz, SelectColumn.includes(selectedColumn), flipper, node).thenApply((Sheet<T> sheet) -> {
final Sheet<V> rs = new Sheet<>();
if (sheet.isEmpty()) return rs;
rs.setTotal(sheet.getTotal());

52
src/org/redkale/util/SelectColumn.java
View File

@@ -70,6 +70,7 @@ public class SelectColumn implements Predicate<String> {
}
/**
* @deprecated
* class中的字段名
*
* @param columns 包含的字段名集合
@@ -81,6 +82,18 @@ public class SelectColumn implements Predicate<String> {
}
/**
* class中的字段名
*
* @param columns 包含的字段名集合
*
* @return SelectColumn
*/
public static SelectColumn includes(String... columns) {
return new SelectColumn(columns, false);
}
/**
* @deprecated
* class中的字段名
*
* @param cols 包含的字段名集合
@@ -93,6 +106,20 @@ public class SelectColumn implements Predicate<String> {
}
/**
* class中的字段名
*
* @param cols 包含的字段名集合
* @param columns 包含的字段名集合
*
* @return SelectColumn
*/
public static SelectColumn includes(String[] cols, String... columns) {
return new SelectColumn(Utility.append(cols, columns), false);
}
/**
* @deprecated
*
* class中的字段名
*
* @param columns 排除的字段名集合
@@ -104,6 +131,18 @@ public class SelectColumn implements Predicate<String> {
}
/**
* class中的字段名
*
* @param columns 排除的字段名集合
*
* @return SelectColumn
*/
public static SelectColumn excludes(String... columns) {
return new SelectColumn(columns, true);
}
/**
* @deprecated
* class中的字段名
*
* @param cols 排除的字段名集合
@@ -115,6 +154,19 @@ public class SelectColumn implements Predicate<String> {
return new SelectColumn(Utility.append(cols, columns), true);
}
/**
*
* class中的字段名
*
* @param cols 排除的字段名集合
* @param columns 排除的字段名集合
*
* @return SelectColumn
*/
public static SelectColumn excludes(String[] cols, String... columns) {
return new SelectColumn(Utility.append(cols, columns), true);
}
@Override
public boolean test(final String column) {
if (this.columns != null) {