From dc487f9226703c38b027793f492a6e19096a0aa6 Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Fri, 17 Mar 2017 12:03:42 +0800 Subject: [PATCH] --- src/org/redkale/convert/ConvertFactory.java | 1 + .../convert/ext/AsyncHandlerSimpledCoder.java | 36 +++ src/org/redkale/net/sncp/SncpClient.java | 2 +- .../redkale/service/DataSourceService.java | 217 ++++++++------ src/org/redkale/source/DataDefaultSource.java | 217 ++++++++------ src/org/redkale/source/DataSource.java | 266 +++++++++++++----- 6 files changed, 502 insertions(+), 237 deletions(-) create mode 100644 src/org/redkale/convert/ext/AsyncHandlerSimpledCoder.java diff --git a/src/org/redkale/convert/ConvertFactory.java b/src/org/redkale/convert/ConvertFactory.java index e9af152fc..df24ec232 100644 --- a/src/org/redkale/convert/ConvertFactory.java +++ b/src/org/redkale/convert/ConvertFactory.java @@ -92,6 +92,7 @@ public abstract class ConvertFactory { this.register(InetSocketAddress.class, InetSocketAddressSimpledCoder.instance); this.register(Pattern.class, PatternSimpledCoder.instance); this.register(CompletionHandler.class, CompletionHandlerSimpledCoder.instance); + this.register(AsyncHandler.class, AsyncHandlerSimpledCoder.instance); this.register(URL.class, URLSimpledCoder.instance); this.register(URI.class, URISimpledCoder.instance); //--------------------------------------------------------- diff --git a/src/org/redkale/convert/ext/AsyncHandlerSimpledCoder.java b/src/org/redkale/convert/ext/AsyncHandlerSimpledCoder.java new file mode 100644 index 000000000..edadc177d --- /dev/null +++ b/src/org/redkale/convert/ext/AsyncHandlerSimpledCoder.java @@ -0,0 +1,36 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.redkale.convert.ext; + +import org.redkale.convert.*; +import org.redkale.util.AsyncHandler; + +/** + * AsyncHandlerSimpledCoder 的SimpledCoder实现, 只输出null + * + *

+ * 详情见: https://redkale.org + * + * @author zhangjx + * @param Reader输入的子类型 + * @param Writer输出的子类型 + */ +public final class AsyncHandlerSimpledCoder extends SimpledCoder { + + public static final AsyncHandlerSimpledCoder instance = new AsyncHandlerSimpledCoder(); + + @Override + public void convertTo(W out, AsyncHandler value) { + out.writeObjectNull(AsyncHandler.class); + } + + @Override + public AsyncHandler convertFrom(R in) { + in.readObjectB(AsyncHandler.class); + return null; + } + +} diff --git a/src/org/redkale/net/sncp/SncpClient.java b/src/org/redkale/net/sncp/SncpClient.java index 84a921eae..0b8b5df70 100644 --- a/src/org/redkale/net/sncp/SncpClient.java +++ b/src/org/redkale/net/sncp/SncpClient.java @@ -73,6 +73,7 @@ public final class SncpClient { for (int i = 0; i < params.length; i++) { if (AsyncHandler.class.isAssignableFrom(params[i])) { handlerFuncIndex = i; + this.paramTypes[i] = AsyncHandler.class; break; } } @@ -106,7 +107,6 @@ public final class SncpClient { this.handlerFuncParamIndex = handlerFuncIndex; this.handlerAttachParamIndex = handlerAttachIndex; this.paramAttrs = hasattr ? atts : null; - if (this.handlerFuncParamIndex >= 0 && method.getReturnType() != void.class) throw new RuntimeException(method + " has AsyncHandler type parameter but return type is not void"); } @Override diff --git a/src/org/redkale/service/DataSourceService.java b/src/org/redkale/service/DataSourceService.java index e13f43153..43210ae69 100644 --- a/src/org/redkale/service/DataSourceService.java +++ b/src/org/redkale/service/DataSourceService.java @@ -45,9 +45,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void delete(final AsyncHandler handler, @RpcAttachment final T... values) { + public int delete(final AsyncHandler handler, @RpcAttachment final T... values) { int rs = source.delete(values); if (handler != null) handler.completed(rs, values); + return rs; } @Override @@ -56,9 +57,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void delete(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable... ids) { + public int delete(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable... ids) { int rs = source.delete(clazz, ids); if (handler != null) handler.completed(rs, ids); + return rs; } @Override @@ -67,9 +69,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void delete(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node) { + public int delete(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node) { int rs = source.delete(clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -78,9 +81,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void delete(final AsyncHandler handler, final Class clazz, final Flipper flipper, @RpcAttachment FilterNode node) { + public int delete(final AsyncHandler handler, final Class clazz, final Flipper flipper, @RpcAttachment FilterNode node) { int rs = source.delete(clazz, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -89,9 +93,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void update(final AsyncHandler handler, @RpcAttachment final T... values) { + public int update(final AsyncHandler handler, @RpcAttachment final T... values) { int rs = source.update(values); if (handler != null) handler.completed(rs, values); + return rs; } @Override @@ -100,9 +105,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void updateColumn(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable id, final String column, final Serializable value) { + public int updateColumn(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable id, final String column, final Serializable value) { int rs = source.updateColumn(clazz, id, column, value); if (handler != null) handler.completed(rs, id); + return rs; } @Override @@ -111,9 +117,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void updateColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable value, @RpcAttachment final FilterNode node) { + public int updateColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable value, @RpcAttachment final FilterNode node) { int rs = source.updateColumn(clazz, column, value, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -122,9 +129,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void updateColumn(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable id, final ColumnValue... values) { + public int updateColumn(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable id, final ColumnValue... values) { int rs = source.updateColumn(clazz, id, values); if (handler != null) handler.completed(rs, id); + return rs; } @Override @@ -133,9 +141,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void updateColumn(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node, final ColumnValue... values) { + public int updateColumn(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node, final ColumnValue... values) { int rs = source.updateColumn(clazz, node, values); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -144,9 +153,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void updateColumn(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node, final Flipper flipper, final ColumnValue... values) { + public int updateColumn(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node, final Flipper flipper, final ColumnValue... values) { int rs = source.updateColumn(clazz, node, flipper, values); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -155,9 +165,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void updateColumn(final AsyncHandler handler, @RpcAttachment final T bean, final String... columns) { + public int updateColumn(final AsyncHandler handler, @RpcAttachment final T bean, final String... columns) { int rs = source.updateColumn(bean, columns); if (handler != null) handler.completed(rs, bean); + return rs; } @Override @@ -166,9 +177,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void updateColumn(final AsyncHandler handler, final T bean, @RpcAttachment final FilterNode node, final String... columns) { + public int updateColumn(final AsyncHandler handler, final T bean, @RpcAttachment final FilterNode node, final String... columns) { int rs = source.updateColumn(bean, node, columns); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -177,9 +189,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void updateColumn(final AsyncHandler handler, @RpcAttachment final T bean, final SelectColumn selects) { + public int updateColumn(final AsyncHandler handler, @RpcAttachment final T bean, final SelectColumn selects) { int rs = source.updateColumn(bean, selects); if (handler != null) handler.completed(rs, bean); + return rs; } @Override @@ -188,9 +201,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void updateColumn(final AsyncHandler handler, final T bean, @RpcAttachment final FilterNode node, final SelectColumn selects) { + public int updateColumn(final AsyncHandler handler, final T bean, @RpcAttachment final FilterNode node, final SelectColumn selects) { int rs = source.updateColumn(bean, node, selects); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -199,9 +213,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, @RpcAttachment final String column) { + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, @RpcAttachment final String column) { Number rs = source.getNumberResult(entityClass, func, column); if (handler != null) handler.completed(rs, column); + return rs; } @Override @@ -210,8 +225,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterBean bean) { - getNumberResult(handler, entityClass, func, column, FilterNodeBean.createFilterNode(bean)); + public final Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterBean bean) { + return getNumberResult(handler, entityClass, func, column, FilterNodeBean.createFilterNode(bean)); } @Override @@ -220,9 +235,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, @RpcAttachment final FilterNode node) { + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, @RpcAttachment final FilterNode node) { Number rs = source.getNumberResult(entityClass, func, column, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -231,9 +247,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column) { + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column) { Number rs = source.getNumberResult(entityClass, func, defVal, column); if (handler != null) handler.completed(rs, column); + return rs; } @Override @@ -242,8 +259,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column, final FilterBean bean) { - getNumberResult(handler, entityClass, func, defVal, column, FilterNodeBean.createFilterNode(bean)); + public final Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column, final FilterBean bean) { + return getNumberResult(handler, entityClass, func, defVal, column, FilterNodeBean.createFilterNode(bean)); } @Override @@ -252,9 +269,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column, final FilterNode node) { + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, @RpcAttachment final String column, final FilterNode node) { Number rs = source.getNumberResult(entityClass, func, defVal, column, node); if (handler != null) handler.completed(rs, column); + return rs; } @Override @@ -263,9 +281,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void getNumberMap(final AsyncHandler, FilterFuncColumn[]> handler, final Class entityClass, @RpcAttachment final FilterFuncColumn... columns) { + public Map getNumberMap(final AsyncHandler, FilterFuncColumn[]> handler, final Class entityClass, @RpcAttachment final FilterFuncColumn... columns) { Map rs = source.getNumberMap(entityClass, columns); if (handler != null) handler.completed(rs, columns); + return rs; } @Override @@ -274,8 +293,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, @RpcAttachment final FilterBean bean, final FilterFuncColumn... columns) { - getNumberMap(handler, entityClass, FilterNodeBean.createFilterNode(bean), columns); + public final Map getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, @RpcAttachment final FilterBean bean, final FilterFuncColumn... columns) { + return getNumberMap(handler, entityClass, FilterNodeBean.createFilterNode(bean), columns); } @Override @@ -284,9 +303,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, @RpcAttachment final FilterNode node, final FilterFuncColumn... columns) { + public Map getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, @RpcAttachment final FilterNode node, final FilterFuncColumn... columns) { Map rs = source.getNumberMap(entityClass, node, columns); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -295,9 +315,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn) { + public Map queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn) { Map rs = source.queryColumnMap(entityClass, keyColumn, func, funcColumn); if (handler != null) handler.completed(rs, keyColumn); + return rs; } @Override @@ -306,8 +327,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) { - queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, FilterNodeBean.createFilterNode(bean)); + public final Map queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) { + return queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, FilterNodeBean.createFilterNode(bean)); } @Override @@ -316,9 +337,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node) { + public Map queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, @RpcAttachment final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node) { Map rs = source.queryColumnMap(entityClass, keyColumn, func, funcColumn, node); if (handler != null) handler.completed(rs, keyColumn); + return rs; } @Override @@ -327,9 +349,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void find(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable pk) { + public T find(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable pk) { T rs = source.find(clazz, pk); if (handler != null) handler.completed(rs, pk); + return rs; } @Override @@ -338,9 +361,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void find(final AsyncHandler handler, final Class clazz, SelectColumn selects, @RpcAttachment final Serializable pk) { + public T find(final AsyncHandler handler, final Class clazz, SelectColumn selects, @RpcAttachment final Serializable pk) { T rs = source.find(clazz, selects, pk); if (handler != null) handler.completed(rs, pk); + return rs; } @Override @@ -349,9 +373,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void find(final AsyncHandler handler, final Class clazz, final String column, @RpcAttachment final Serializable key) { + public T find(final AsyncHandler handler, final Class clazz, final String column, @RpcAttachment final Serializable key) { T rs = source.find(clazz, column, key); if (handler != null) handler.completed(rs, key); + return rs; } @Override @@ -360,8 +385,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void find(final AsyncHandler handler, final Class clazz, final FilterBean bean) { - find(handler, clazz, FilterNodeBean.createFilterNode(bean)); + public final T find(final AsyncHandler handler, final Class clazz, final FilterBean bean) { + return find(handler, clazz, FilterNodeBean.createFilterNode(bean)); } @Override @@ -370,9 +395,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void find(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node) { + public T find(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node) { T rs = source.find(clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -381,8 +407,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { - find(handler, clazz, selects, FilterNodeBean.createFilterNode(bean)); + public final T find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { + return find(handler, clazz, selects, FilterNodeBean.createFilterNode(bean)); } @Override @@ -391,9 +417,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, @RpcAttachment final FilterNode node) { + public T find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, @RpcAttachment final FilterNode node) { T rs = source.find(clazz, selects, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -402,9 +429,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void findColumn(final AsyncHandler handler, final Class clazz, final String column, @RpcAttachment final Serializable pk) { + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, @RpcAttachment final Serializable pk) { Serializable rs = source.findColumn(clazz, column, pk); if (handler != null) handler.completed(rs, pk); + return rs; } @Override @@ -413,8 +441,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void findColumn(final AsyncHandler handler, final Class clazz, final String column, final FilterBean bean) { - findColumn(handler, clazz, column, FilterNodeBean.createFilterNode(bean)); + public final Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final FilterBean bean) { + return findColumn(handler, clazz, column, FilterNodeBean.createFilterNode(bean)); } @Override @@ -423,9 +451,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void findColumn(final AsyncHandler handler, final Class clazz, final String column, @RpcAttachment final FilterNode node) { + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, @RpcAttachment final FilterNode node) { Serializable rs = source.findColumn(clazz, column, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -434,9 +463,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, @RpcAttachment final Serializable pk) { + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, @RpcAttachment final Serializable pk) { Serializable rs = source.findColumn(clazz, column, defValue, pk); if (handler != null) handler.completed(rs, pk); + return rs; } @Override @@ -445,8 +475,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterBean bean) { - findColumn(handler, clazz, column, defValue, FilterNodeBean.createFilterNode(bean)); + public final Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterBean bean) { + return findColumn(handler, clazz, column, defValue, FilterNodeBean.createFilterNode(bean)); } @Override @@ -455,9 +485,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, @RpcAttachment final FilterNode node) { + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, @RpcAttachment final FilterNode node) { Serializable rs = source.findColumn(clazz, column, defValue, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -466,9 +497,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void exists(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable pk) { + public boolean exists(final AsyncHandler handler, final Class clazz, @RpcAttachment final Serializable pk) { boolean rs = source.exists(clazz, pk); if (handler != null) handler.completed(rs, pk); + return rs; } @Override @@ -477,8 +509,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void exists(final AsyncHandler handler, final Class clazz, final FilterBean bean) { - exists(handler, clazz, FilterNodeBean.createFilterNode(bean)); + public final boolean exists(final AsyncHandler handler, final Class clazz, final FilterBean bean) { + return exists(handler, clazz, FilterNodeBean.createFilterNode(bean)); } @Override @@ -487,9 +519,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void exists(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node) { + public boolean exists(final AsyncHandler handler, final Class clazz, @RpcAttachment final FilterNode node) { boolean rs = source.exists(clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -498,9 +531,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryColumnSet(final AsyncHandler, String> handler, final String selectedColumn, final Class clazz, @RpcAttachment final String column, final Serializable key) { + public HashSet queryColumnSet(final AsyncHandler, String> handler, final String selectedColumn, final Class clazz, @RpcAttachment final String column, final Serializable key) { HashSet rs = source.queryColumnSet(selectedColumn, clazz, column, key); if (handler != null) handler.completed(rs, column); + return rs; } @Override @@ -509,8 +543,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean) { - queryColumnSet(handler, selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); + public final HashSet queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean) { + return queryColumnSet(handler, selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); } @Override @@ -519,9 +553,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, @RpcAttachment final FilterNode node) { + public HashSet queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, @RpcAttachment final FilterNode node) { HashSet rs = source.queryColumnSet(selectedColumn, clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -530,9 +565,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryColumnList(final AsyncHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, @RpcAttachment final Serializable key) { + public List queryColumnList(final AsyncHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, @RpcAttachment final Serializable key) { List rs = source.queryColumnList(selectedColumn, clazz, column, key); if (handler != null) handler.completed(rs, key); + return rs; } @Override @@ -541,8 +577,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void queryColumnList(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, FilterBean bean) { - queryColumnList(handler, selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); + public final List queryColumnList(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, FilterBean bean) { + return queryColumnList(handler, selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); } @Override @@ -551,9 +587,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, @RpcAttachment final FilterNode node) { + public List queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, @RpcAttachment final FilterNode node) { List rs = source.queryColumnList(selectedColumn, clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -562,8 +599,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void queryColumnList(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { - queryColumnList(handler, selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); + public final List queryColumnList(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { + return queryColumnList(handler, selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -572,9 +609,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, Flipper flipper, @RpcAttachment final FilterNode node) { + public List queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, Flipper flipper, @RpcAttachment final FilterNode node) { List rs = source.queryColumnList(selectedColumn, clazz, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -583,8 +621,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void queryColumnSheet(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { - queryColumnSheet(handler, selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); + public final Sheet queryColumnSheet(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { + return queryColumnSheet(handler, selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -593,9 +631,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryColumnSheet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, @RpcAttachment final FilterNode node) { + public Sheet queryColumnSheet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, @RpcAttachment final FilterNode node) { Sheet rs = source.queryColumnSheet(selectedColumn, clazz, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -604,9 +643,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryList(final AsyncHandler, Serializable> handler, final Class clazz, final String column, @RpcAttachment final Serializable key) { + public List queryList(final AsyncHandler, Serializable> handler, final Class clazz, final String column, @RpcAttachment final Serializable key) { List rs = source.queryList(clazz, column, key); if (handler != null) handler.completed(rs, key); + return rs; } @Override @@ -615,8 +655,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterBean bean) { - queryList(handler, clazz, FilterNodeBean.createFilterNode(bean)); + public final List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterBean bean) { + return queryList(handler, clazz, FilterNodeBean.createFilterNode(bean)); } @Override @@ -625,9 +665,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, @RpcAttachment final FilterNode node) { + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, @RpcAttachment final FilterNode node) { List rs = source.queryList(clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -636,8 +677,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { - queryList(handler, clazz, selects, FilterNodeBean.createFilterNode(bean)); + public final List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { + return queryList(handler, clazz, selects, FilterNodeBean.createFilterNode(bean)); } @Override @@ -646,9 +687,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, @RpcAttachment final FilterNode node) { + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, @RpcAttachment final FilterNode node) { List rs = source.queryList(clazz, selects, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -657,9 +699,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryList(final AsyncHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, @RpcAttachment final Serializable key) { + public List queryList(final AsyncHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, @RpcAttachment final Serializable key) { List rs = source.queryList(clazz, flipper, column, key); if (handler != null) handler.completed(rs, key); + return rs; } @Override @@ -668,8 +711,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { - queryList(handler, clazz, flipper, FilterNodeBean.createFilterNode(bean)); + public final List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { + return queryList(handler, clazz, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -678,9 +721,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, @RpcAttachment final FilterNode node) { + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, @RpcAttachment final FilterNode node) { List rs = source.queryList(clazz, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -689,8 +733,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { - queryList(handler, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); + public final List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { + return queryList(handler, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -699,9 +743,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final FilterNode node) { + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final FilterNode node) { List rs = source.queryList(clazz, selects, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -710,8 +755,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { - querySheet(handler, clazz, flipper, FilterNodeBean.createFilterNode(bean)); + public final Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { + return querySheet(handler, clazz, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -720,9 +765,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, @RpcAttachment final FilterNode node) { + public Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, @RpcAttachment final FilterNode node) { Sheet rs = source.querySheet(clazz, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -731,8 +777,8 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public final void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { - querySheet(handler, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); + public final Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { + return querySheet(handler, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -741,9 +787,10 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { } @Override - public void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final FilterNode node) { + public Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, @RpcAttachment final FilterNode node) { Sheet rs = source.querySheet(clazz, selects, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java index 1dbed05cf..30175acd8 100644 --- a/src/org/redkale/source/DataDefaultSource.java +++ b/src/org/redkale/source/DataDefaultSource.java @@ -423,9 +423,10 @@ public final class DataDefaultSource implements DataSource, Function void delete(final AsyncHandler handler, final T... values) { + public int delete(final AsyncHandler handler, final T... values) { int rs = delete(values); if (handler != null) handler.completed(rs, values); + return rs; } private int delete(final Connection conn, final EntityInfo info, T... values) { @@ -454,9 +455,10 @@ public final class DataDefaultSource implements DataSource, Function void delete(final AsyncHandler handler, final Class clazz, final Serializable... ids) { + public int delete(final AsyncHandler handler, final Class clazz, final Serializable... ids) { int rs = delete(clazz, ids); if (handler != null) handler.completed(rs, ids); + return rs; } private int delete(final Connection conn, final EntityInfo info, Serializable... keys) { @@ -508,9 +510,10 @@ public final class DataDefaultSource implements DataSource, Function void delete(final AsyncHandler handler, final Class clazz, final FilterNode node) { + public int delete(final AsyncHandler handler, final Class clazz, final FilterNode node) { int rs = delete(clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -528,9 +531,10 @@ public final class DataDefaultSource implements DataSource, Function void delete(final AsyncHandler handler, final Class clazz, final Flipper flipper, FilterNode node) { + public int delete(final AsyncHandler handler, final Class clazz, final Flipper flipper, FilterNode node) { int rs = delete(clazz, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } private int delete(final Connection conn, final EntityInfo info, final Flipper flipper, final FilterNode node) { @@ -619,9 +623,10 @@ public final class DataDefaultSource implements DataSource, Function void update(final AsyncHandler handler, final T... values) { + public int update(final AsyncHandler handler, final T... values) { int rs = update(values); if (handler != null) handler.completed(rs, values); + return rs; } private int update(final Connection conn, final EntityInfo info, T... values) { @@ -716,9 +721,10 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final AsyncHandler handler, final Class clazz, final Serializable id, final String column, final Serializable value) { + public int updateColumn(final AsyncHandler handler, final Class clazz, final Serializable id, final String column, final Serializable value) { int rs = updateColumn(clazz, id, column, value); if (handler != null) handler.completed(rs, id); + return rs; } private int updateColumn(Connection conn, final EntityInfo info, Serializable id, String column, final Serializable value) { @@ -784,9 +790,10 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable value, final FilterNode node) { + public int updateColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable value, final FilterNode node) { int rs = updateColumn(clazz, column, value, node); if (handler != null) handler.completed(rs, node); + return rs; } private int updateColumn(Connection conn, final EntityInfo info, String column, final Serializable value, FilterNode node) { @@ -867,9 +874,10 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final AsyncHandler handler, final Class clazz, final Serializable id, final ColumnValue... values) { + public int updateColumn(final AsyncHandler handler, final Class clazz, final Serializable id, final ColumnValue... values) { int rs = updateColumn(clazz, id, values); if (handler != null) handler.completed(rs, id); + return rs; } private int updateColumn(final Connection conn, final EntityInfo info, final Serializable id, final ColumnValue... values) { @@ -954,9 +962,10 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final AsyncHandler handler, final Class clazz, final FilterNode node, final ColumnValue... values) { + public int updateColumn(final AsyncHandler handler, final Class clazz, final FilterNode node, final ColumnValue... values) { int rs = updateColumn(clazz, node, values); if (handler != null) handler.completed(rs, node); + return rs; } /** @@ -985,9 +994,10 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final AsyncHandler handler, final Class clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values) { + public int updateColumn(final AsyncHandler handler, final Class clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values) { int rs = updateColumn(clazz, node, flipper, values); if (handler != null) handler.completed(rs, node); + return rs; } private int updateColumn(final Connection conn, final EntityInfo info, final FilterNode node, final Flipper flipper, final ColumnValue... values) { @@ -1067,9 +1077,10 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final AsyncHandler handler, final T bean, final String... columns) { + public int updateColumn(final AsyncHandler handler, final T bean, final String... columns) { int rs = updateColumn(bean, columns); if (handler != null) handler.completed(rs, bean); + return rs; } @Override @@ -1087,9 +1098,10 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final AsyncHandler handler, final T bean, final SelectColumn selects) { + public int updateColumn(final AsyncHandler handler, final T bean, final SelectColumn selects) { int rs = updateColumn(bean, selects); if (handler != null) handler.completed(rs, bean); + return rs; } private int updateColumns(final Connection conn, final EntityInfo info, final T bean, final SelectColumn selects) { @@ -1155,9 +1167,10 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final AsyncHandler handler, final T bean, final FilterNode node, final String... columns) { + public int updateColumn(final AsyncHandler handler, final T bean, final FilterNode node, final String... columns) { int rs = updateColumn(bean, node, columns); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -1175,9 +1188,10 @@ public final class DataDefaultSource implements DataSource, Function void updateColumn(final AsyncHandler handler, final T bean, final FilterNode node, final SelectColumn selects) { + public int updateColumn(final AsyncHandler handler, final T bean, final FilterNode node, final SelectColumn selects) { int rs = updateColumn(bean, node, selects); if (handler != null) handler.completed(rs, node); + return rs; } private int updateColumns(final Connection conn, final EntityInfo info, final T bean, final FilterNode node, final SelectColumn selects) { @@ -1282,9 +1296,10 @@ public final class DataDefaultSource implements DataSource, Function handler, final Class entityClass, final FilterFunc func, final String column) { + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column) { Number rs = getNumberResult(entityClass, func, column); if (handler != null) handler.completed(rs, column); + return rs; } @Override @@ -1293,8 +1308,8 @@ public final class DataDefaultSource implements DataSource, Function handler, final Class entityClass, final FilterFunc func, final String column, final FilterBean bean) { - getNumberResult(handler, entityClass, func, column, FilterNodeBean.createFilterNode(bean)); + public final Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterBean bean) { + return getNumberResult(handler, entityClass, func, column, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1303,9 +1318,10 @@ public final class DataDefaultSource implements DataSource, Function handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node) { + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node) { Number rs = getNumberResult(entityClass, func, column, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -1314,9 +1330,10 @@ public final class DataDefaultSource implements DataSource, Function handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column) { + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column) { Number rs = getNumberResult(entityClass, func, defVal, column); if (handler != null) handler.completed(rs, column); + return rs; } @Override @@ -1325,8 +1342,8 @@ public final class DataDefaultSource implements DataSource, Function handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean) { - getNumberResult(handler, entityClass, func, defVal, column, FilterNodeBean.createFilterNode(bean)); + public final Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean) { + return getNumberResult(handler, entityClass, func, defVal, column, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1335,9 +1352,10 @@ public final class DataDefaultSource implements DataSource, Function void getNumberMap(final AsyncHandler, FilterFuncColumn[]> handler, final Class entityClass, final FilterFuncColumn... columns) { + public Map getNumberMap(final AsyncHandler, FilterFuncColumn[]> handler, final Class entityClass, final FilterFuncColumn... columns) { Map rs = getNumberMap(entityClass, columns); if (handler != null) handler.completed(rs, columns); + return rs; } @Override @@ -1346,8 +1364,8 @@ public final class DataDefaultSource implements DataSource, Function void getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, final FilterBean bean, final FilterFuncColumn... columns) { - getNumberMap(handler, entityClass, FilterNodeBean.createFilterNode(bean), columns); + public final Map getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, final FilterBean bean, final FilterFuncColumn... columns) { + return getNumberMap(handler, entityClass, FilterNodeBean.createFilterNode(bean), columns); } @Override @@ -1415,9 +1433,10 @@ public final class DataDefaultSource implements DataSource, Function void getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, final FilterNode node, final FilterFuncColumn... columns) { + public Map getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, final FilterNode node, final FilterFuncColumn... columns) { Map rs = getNumberMap(entityClass, node, columns); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -1457,9 +1476,10 @@ public final class DataDefaultSource implements DataSource, Function handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node) { + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node) { Number rs = getNumberResult(entityClass, func, defVal, column, node); if (handler != null) handler.completed(rs, column); + return rs; } //-----------------------queryColumnMap----------------------------- @@ -1469,9 +1489,10 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn) { + public Map queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn) { Map rs = queryColumnMap(entityClass, keyColumn, func, funcColumn); if (handler != null) handler.completed(rs, keyColumn); + return rs; } @Override @@ -1480,8 +1501,8 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) { - queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, FilterNodeBean.createFilterNode(bean)); + public final Map queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean) { + return queryColumnMap(handler, entityClass, keyColumn, func, funcColumn, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1523,9 +1544,10 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node) { + public Map queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node) { Map rs = queryColumnMap(entityClass, keyColumn, func, funcColumn, node); if (handler != null) handler.completed(rs, keyColumn); + return rs; } //-----------------------find---------------------------- @@ -1544,9 +1566,10 @@ public final class DataDefaultSource implements DataSource, Function void find(final AsyncHandler handler, final Class clazz, final Serializable pk) { + public T find(final AsyncHandler handler, final Class clazz, final Serializable pk) { T rs = find(clazz, pk); if (handler != null) handler.completed(rs, pk); + return rs; } @Override @@ -1582,9 +1605,10 @@ public final class DataDefaultSource implements DataSource, Function void find(final AsyncHandler handler, final Class clazz, SelectColumn selects, final Serializable pk) { + public T find(final AsyncHandler handler, final Class clazz, SelectColumn selects, final Serializable pk) { T rs = find(clazz, selects, pk); if (handler != null) handler.completed(rs, pk); + return rs; } @Override @@ -1593,9 +1617,10 @@ public final class DataDefaultSource implements DataSource, Function void find(final AsyncHandler handler, final Class clazz, final String column, final Serializable key) { + public T find(final AsyncHandler handler, final Class clazz, final String column, final Serializable key) { T rs = find(clazz, column, key); if (handler != null) handler.completed(rs, key); + return rs; } @Override @@ -1604,8 +1629,8 @@ public final class DataDefaultSource implements DataSource, Function void find(final AsyncHandler handler, final Class clazz, final FilterBean bean) { - find(handler, clazz, FilterNodeBean.createFilterNode(bean)); + public final T find(final AsyncHandler handler, final Class clazz, final FilterBean bean) { + return find(handler, clazz, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1614,9 +1639,10 @@ public final class DataDefaultSource implements DataSource, Function void find(final AsyncHandler handler, final Class clazz, final FilterNode node) { + public T find(final AsyncHandler handler, final Class clazz, final FilterNode node) { T rs = find(clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -1625,8 +1651,8 @@ public final class DataDefaultSource implements DataSource, Function void find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { - find(handler, clazz, selects, FilterNodeBean.createFilterNode(bean)); + public final T find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { + return find(handler, clazz, selects, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1662,9 +1688,10 @@ public final class DataDefaultSource implements DataSource, Function void find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterNode node) { + public T find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterNode node) { T rs = find(clazz, selects, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -1673,9 +1700,10 @@ public final class DataDefaultSource implements DataSource, Function void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable pk) { + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable pk) { Serializable rs = findColumn(clazz, column, pk); if (handler != null) handler.completed(rs, pk); + return rs; } @Override @@ -1684,8 +1712,8 @@ public final class DataDefaultSource implements DataSource, Function void findColumn(final AsyncHandler handler, final Class clazz, final String column, final FilterBean bean) { - findColumn(handler, clazz, column, FilterNodeBean.createFilterNode(bean)); + public final Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final FilterBean bean) { + return findColumn(handler, clazz, column, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1694,9 +1722,10 @@ public final class DataDefaultSource implements DataSource, Function void findColumn(final AsyncHandler handler, final Class clazz, final String column, final FilterNode node) { + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final FilterNode node) { Serializable rs = findColumn(clazz, column, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -1740,9 +1769,10 @@ public final class DataDefaultSource implements DataSource, Function void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final Serializable pk) { + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final Serializable pk) { Serializable rs = findColumn(clazz, column, defValue, pk); if (handler != null) handler.completed(rs, pk); + return rs; } @Override @@ -1751,8 +1781,8 @@ public final class DataDefaultSource implements DataSource, Function void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterBean bean) { - findColumn(handler, clazz, column, defValue, FilterNodeBean.createFilterNode(bean)); + public final Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterBean bean) { + return findColumn(handler, clazz, column, defValue, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1796,9 +1826,10 @@ public final class DataDefaultSource implements DataSource, Function void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterNode node) { + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterNode node) { Serializable rs = findColumn(clazz, column, defValue, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -1836,9 +1867,10 @@ public final class DataDefaultSource implements DataSource, Function void exists(final AsyncHandler handler, final Class clazz, final Serializable pk) { + public boolean exists(final AsyncHandler handler, final Class clazz, final Serializable pk) { boolean rs = exists(clazz, pk); if (handler != null) handler.completed(rs, pk); + return rs; } @Override @@ -1847,8 +1879,8 @@ public final class DataDefaultSource implements DataSource, Function void exists(final AsyncHandler handler, final Class clazz, final FilterBean bean) { - exists(handler, clazz, FilterNodeBean.createFilterNode(bean)); + public final boolean exists(final AsyncHandler handler, final Class clazz, final FilterBean bean) { + return exists(handler, clazz, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1886,9 +1918,10 @@ public final class DataDefaultSource implements DataSource, Function void exists(final AsyncHandler handler, final Class clazz, final FilterNode node) { + public boolean exists(final AsyncHandler handler, final Class clazz, final FilterNode node) { boolean rs = exists(clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } //-----------------------list set---------------------------- @@ -1898,9 +1931,10 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnSet(final AsyncHandler, String> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key) { + public HashSet queryColumnSet(final AsyncHandler, String> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key) { HashSet rs = queryColumnSet(selectedColumn, clazz, column, key); if (handler != null) handler.completed(rs, column); + return rs; } @Override @@ -1909,8 +1943,8 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean) { - queryColumnSet(handler, selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); + public final HashSet queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean) { + return queryColumnSet(handler, selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1919,9 +1953,10 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node) { + public HashSet queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node) { HashSet rs = queryColumnSet(selectedColumn, clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -1930,9 +1965,10 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnList(final AsyncHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key) { + public List queryColumnList(final AsyncHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key) { List rs = queryColumnList(selectedColumn, clazz, column, key); if (handler != null) handler.completed(rs, key); + return rs; } @Override @@ -1941,8 +1977,8 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnList(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, FilterBean bean) { - queryColumnList(handler, selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); + public final List queryColumnList(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, FilterBean bean) { + return queryColumnList(handler, selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1951,9 +1987,10 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node) { + public List queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node) { List rs = queryColumnList(selectedColumn, clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -1962,8 +1999,8 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnList(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { - queryColumnList(handler, selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); + public final List queryColumnList(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { + return queryColumnList(handler, selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -1972,9 +2009,10 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, Flipper flipper, final FilterNode node) { + public List queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, Flipper flipper, final FilterNode node) { List rs = queryColumnList(selectedColumn, clazz, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } /** @@ -1995,8 +2033,8 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnSheet(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { - queryColumnSheet(handler, selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); + public final Sheet queryColumnSheet(final AsyncHandler, FilterNode> handler, String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { + return queryColumnSheet(handler, selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -2005,9 +2043,10 @@ public final class DataDefaultSource implements DataSource, Function void queryColumnSheet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node) { + public Sheet queryColumnSheet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node) { Sheet rs = queryColumnSheet(selectedColumn, clazz, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } private Sheet queryColumnSheet(final boolean needtotal, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node) { @@ -2041,9 +2080,10 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final AsyncHandler, Serializable> handler, final Class clazz, final String column, final Serializable key) { + public List queryList(final AsyncHandler, Serializable> handler, final Class clazz, final String column, final Serializable key) { List rs = queryList(clazz, column, key); if (handler != null) handler.completed(rs, key); + return rs; } /** @@ -2061,8 +2101,8 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterBean bean) { - queryList(handler, clazz, FilterNodeBean.createFilterNode(bean)); + public final List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterBean bean) { + return queryList(handler, clazz, FilterNodeBean.createFilterNode(bean)); } @Override @@ -2071,9 +2111,10 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterNode node) { + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterNode node) { List rs = queryList(clazz, node); if (handler != null) handler.completed(rs, node); + return rs; } /** @@ -2092,8 +2133,8 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { - queryList(handler, clazz, selects, FilterNodeBean.createFilterNode(bean)); + public final List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterBean bean) { + return queryList(handler, clazz, selects, FilterNodeBean.createFilterNode(bean)); } @Override @@ -2102,9 +2143,10 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterNode node) { + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterNode node) { List rs = queryList(clazz, selects, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -2113,9 +2155,10 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final AsyncHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, final Serializable key) { + public List queryList(final AsyncHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, final Serializable key) { List rs = queryList(clazz, flipper, column, key); if (handler != null) handler.completed(rs, key); + return rs; } @Override @@ -2124,8 +2167,8 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { - queryList(handler, clazz, flipper, FilterNodeBean.createFilterNode(bean)); + public final List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { + return queryList(handler, clazz, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -2134,9 +2177,10 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node) { + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node) { List rs = queryList(clazz, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } @Override @@ -2145,8 +2189,8 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { - queryList(handler, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); + public final List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { + return queryList(handler, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -2155,9 +2199,10 @@ public final class DataDefaultSource implements DataSource, Function void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { List rs = queryList(clazz, selects, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } //-----------------------sheet---------------------------- @@ -2177,8 +2222,8 @@ public final class DataDefaultSource implements DataSource, Function void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { - querySheet(handler, clazz, flipper, FilterNodeBean.createFilterNode(bean)); + public final Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean) { + return querySheet(handler, clazz, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -2187,9 +2232,10 @@ public final class DataDefaultSource implements DataSource, Function void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node) { + public Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node) { Sheet rs = querySheet(clazz, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } /** @@ -2209,8 +2255,8 @@ public final class DataDefaultSource implements DataSource, Function void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { - querySheet(handler, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); + public final Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean) { + return querySheet(handler, clazz, selects, flipper, FilterNodeBean.createFilterNode(bean)); } @Override @@ -2219,9 +2265,10 @@ public final class DataDefaultSource implements DataSource, Function void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { + public Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { Sheet rs = querySheet(clazz, selects, flipper, node); if (handler != null) handler.completed(rs, node); + return rs; } private Sheet querySheet(final boolean readcache, final boolean needtotal, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node) { diff --git a/src/org/redkale/source/DataSource.java b/src/org/redkale/source/DataSource.java index b7cf689b1..2df3501cf 100644 --- a/src/org/redkale/source/DataSource.java +++ b/src/org/redkale/source/DataSource.java @@ -62,8 +62,10 @@ public interface DataSource { * @param handler 回调函数 * @param values Entity对象 * + * @return 影响的记录条数 + * */ - public void delete(final AsyncHandler handler, final T... values); + public int delete(final AsyncHandler handler, final T... values); /** * 删除指定主键值的记录
@@ -86,8 +88,10 @@ public interface DataSource { * @param clazz Entity类 * @param ids 主键值 * + * @return 影响的记录条数 + * */ - public void delete(final AsyncHandler handler, final Class clazz, final Serializable... ids); + public int delete(final AsyncHandler handler, final Class clazz, final Serializable... ids); /** * 删除符合过滤条件的记录
@@ -110,8 +114,10 @@ public interface DataSource { * @param clazz Entity类 * @param node 过滤条件 * + * @return 影响的记录条数 + * */ - public void delete(final AsyncHandler handler, final Class clazz, final FilterNode node); + public int delete(final AsyncHandler handler, final Class clazz, final FilterNode node); /** * 删除符合过滤条件且指定最大影响条数的记录
@@ -138,8 +144,10 @@ public interface DataSource { * @param flipper 翻页对象 * @param node 过滤条件 * + * @return 影响的记录条数 + * */ - public void delete(final AsyncHandler handler, final Class clazz, final Flipper flipper, final FilterNode node); + public int delete(final AsyncHandler handler, final Class clazz, final Flipper flipper, final FilterNode node); //------------------------update--------------------------- /** @@ -167,8 +175,10 @@ public interface DataSource { * @param handler 回调函数 * @param values Entity对象 * + * @return 影响的记录条数 + * */ - public void update(final AsyncHandler handler, final T... values); + public int update(final AsyncHandler handler, final T... values); /** * 更新单个记录的单个字段
@@ -197,8 +207,10 @@ public interface DataSource { * @param column 待更新的字段名 * @param value 更新值 * + * @return 影响的记录条数 + * */ - public void updateColumn(final AsyncHandler handler, final Class clazz, final Serializable id, final String column, final Serializable value); + public int updateColumn(final AsyncHandler handler, final Class clazz, final Serializable id, final String column, final Serializable value); /** * 更新符合过滤条件记录的单个字段
@@ -227,8 +239,10 @@ public interface DataSource { * @param value 更新值 * @param node 过滤条件 * + * @return 影响的记录条数 + * */ - public void updateColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable value, final FilterNode node); + public int updateColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable value, final FilterNode node); /** * 更新指定主键值记录的部分字段
@@ -255,8 +269,10 @@ public interface DataSource { * @param id 主键 * @param values 更新字段 * + * @return 影响的记录条数 + * */ - public void updateColumn(final AsyncHandler handler, final Class clazz, final Serializable id, final ColumnValue... values); + public int updateColumn(final AsyncHandler handler, final Class clazz, final Serializable id, final ColumnValue... values); /** * 更新符合过滤条件记录的部分字段
@@ -285,8 +301,10 @@ public interface DataSource { * @param node 过滤条件 * @param values 更新字段 * + * @return 影响的记录条数 + * */ - public void updateColumn(final AsyncHandler handler, final Class clazz, final FilterNode node, final ColumnValue... values); + public int updateColumn(final AsyncHandler handler, final Class clazz, final FilterNode node, final ColumnValue... values); /** * 更新符合过滤条件的记录的指定字段
@@ -317,8 +335,10 @@ public interface DataSource { * @param flipper 翻页对象 * @param values 更新字段 * + * @return 影响的记录条数 + * */ - public void updateColumn(final AsyncHandler handler, final Class clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values); + public int updateColumn(final AsyncHandler handler, final Class clazz, final FilterNode node, final Flipper flipper, final ColumnValue... values); /** * 更新单个记录的指定字段
@@ -342,8 +362,10 @@ public interface DataSource { * @param handler 回调函数 * @param bean 待更新的Entity对象 * @param columns 需更新的字段名 + * + * @return 影响的记录条数 */ - public void updateColumn(final AsyncHandler handler, final T bean, final String... columns); + public int updateColumn(final AsyncHandler handler, final T bean, final String... columns); /** * 更新符合过滤条件记录的指定字段
@@ -370,8 +392,10 @@ public interface DataSource { * @param node 过滤条件 * @param columns 需更新的字段名 * + * @return 影响的记录条数 + * */ - public void updateColumn(final AsyncHandler handler, final T bean, final FilterNode node, final String... columns); + public int updateColumn(final AsyncHandler handler, final T bean, final FilterNode node, final String... columns); /** * 更新单个记录的指定字段
@@ -396,8 +420,10 @@ public interface DataSource { * @param bean 待更新的Entity对象 * @param selects 指定字段 * + * @return 影响的记录条数 + * */ - public void updateColumn(final AsyncHandler handler, final T bean, final SelectColumn selects); + public int updateColumn(final AsyncHandler handler, final T bean, final SelectColumn selects); /** * 更新符合过滤条件记录的指定字段
@@ -424,8 +450,10 @@ public interface DataSource { * @param node 过滤条件 * @param selects 指定字段 * + * @return 影响的记录条数 + * */ - public void updateColumn(final AsyncHandler handler, final T bean, final FilterNode node, final SelectColumn selects); + public int updateColumn(final AsyncHandler handler, final T bean, final FilterNode node, final SelectColumn selects); //############################################# 查询接口 ############################################# //-----------------------getXXXXResult----------------------------- @@ -452,8 +480,10 @@ public interface DataSource { * @param func 聚合函数 * @param column 指定字段 * + * @return 聚合结果 + * */ - public void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column); + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column); /** * 获取符合过滤条件记录的聚合结果, 无结果返回null
@@ -480,8 +510,10 @@ public interface DataSource { * @param column 指定字段 * @param bean 过滤条件 * + * @return 聚合结果 + * */ - public void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterBean bean); + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterBean bean); /** * 获取符合过滤条件记录的聚合结果, 无结果返回null
@@ -508,8 +540,10 @@ public interface DataSource { * @param column 指定字段 * @param node 过滤条件 * + * @return 聚合结果 + * */ - public void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node); + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final String column, final FilterNode node); /** * 获取符合过滤条件记录的聚合结果, 无结果返回默认值
@@ -535,8 +569,10 @@ public interface DataSource { * @param func 聚合函数 * @param defVal 默认值 * @param column 指定字段 + * + * @return 聚合结果 */ - public void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column); + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column); /** * 获取符合过滤条件记录的聚合结果, 无结果返回默认值
@@ -564,8 +600,10 @@ public interface DataSource { * @param defVal 默认值 * @param column 指定字段 * @param bean 过滤条件 + * + * @return 聚合结果 */ - public void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean); + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean); /** * 获取符合过滤条件记录的聚合结果, 无结果返回默认值
@@ -594,8 +632,10 @@ public interface DataSource { * @param column 指定字段 * @param node 过滤条件 * + * @return 聚合结果 + * */ - public void getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node); + public Number getNumberResult(final AsyncHandler handler, final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node); /** * 获取符合过滤条件记录的聚合结果Map
@@ -619,8 +659,10 @@ public interface DataSource { * @param handler 回调函数 * @param entityClass Entity类 * @param columns 聚合字段 + * + * @return 聚合结果Map */ - public void getNumberMap(final AsyncHandler, FilterFuncColumn[]> handler, final Class entityClass, final FilterFuncColumn... columns); + public Map getNumberMap(final AsyncHandler, FilterFuncColumn[]> handler, final Class entityClass, final FilterFuncColumn... columns); /** * 获取符合过滤条件记录的聚合结果Map
@@ -646,8 +688,10 @@ public interface DataSource { * @param entityClass Entity类 * @param bean 过滤条件 * @param columns 聚合字段 + * + * @return 聚合结果Map */ - public void getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, final FilterBean bean, final FilterFuncColumn... columns); + public Map getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, final FilterBean bean, final FilterFuncColumn... columns); /** * 获取符合过滤条件记录的聚合结果Map
@@ -673,8 +717,10 @@ public interface DataSource { * @param entityClass Entity类 * @param node 过滤条件 * @param columns 聚合字段 + * + * @return 聚合结果Map */ - public void getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, final FilterNode node, final FilterFuncColumn... columns); + public Map getNumberMap(final AsyncHandler, FilterNode> handler, final Class entityClass, final FilterNode node, final FilterFuncColumn... columns); /** * 查询符合过滤条件记录的GROUP BY聚合结果Map
@@ -706,8 +752,10 @@ public interface DataSource { * @param keyColumn Key字段 * @param func 聚合函数 * @param funcColumn 聚合字段 + * + * @return 聚合结果Map */ - public void queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn); + public Map queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn); /** * 查询符合过滤条件记录的GROUP BY聚合结果Map
@@ -741,8 +789,10 @@ public interface DataSource { * @param func 聚合函数 * @param funcColumn 聚合字段 * @param bean 过滤条件 + * + * @return 聚合结果Map */ - public void queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean); + public Map queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean); /** * 查询符合过滤条件记录的GROUP BY聚合结果Map
@@ -776,8 +826,10 @@ public interface DataSource { * @param func 聚合函数 * @param funcColumn 聚合字段 * @param node 过滤条件 + * + * @return 聚合结果Map */ - public void queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node); + public Map queryColumnMap(final AsyncHandler, String> handler, final Class entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterNode node); //-----------------------find---------------------------- /** @@ -800,8 +852,10 @@ public interface DataSource { * @param handler 回调函数 * @param clazz Entity类 * @param pk 主键值 + * + * @return Entity对象 */ - public void find(final AsyncHandler handler, final Class clazz, final Serializable pk); + public T find(final AsyncHandler handler, final Class clazz, final Serializable pk); /** * 获取指定主键值的单个记录, 返回null表示不存在值
@@ -825,8 +879,10 @@ public interface DataSource { * @param clazz Entity类 * @param selects 指定字段 * @param pk 主键值 + * + * @return Entity对象 */ - public void find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final Serializable pk); + public T find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final Serializable pk); /** * 获取符合过滤条件单个记录, 返回null表示不存在值
@@ -850,8 +906,10 @@ public interface DataSource { * @param clazz Entity类 * @param column 过滤字段名 * @param key 过滤字段值 + * + * @return Entity对象 */ - public void find(final AsyncHandler handler, final Class clazz, final String column, final Serializable key); + public T find(final AsyncHandler handler, final Class clazz, final String column, final Serializable key); /** * 获取符合过滤条件单个记录, 返回null表示不存在值
@@ -873,8 +931,10 @@ public interface DataSource { * @param handler 回调函数 * @param clazz Entity类 * @param bean 过滤条件 + * + * @return Entity对象 */ - public void find(final AsyncHandler handler, final Class clazz, final FilterBean bean); + public T find(final AsyncHandler handler, final Class clazz, final FilterBean bean); /** * 获取符合过滤条件单个记录, 返回null表示不存在值
@@ -896,8 +956,10 @@ public interface DataSource { * @param handler 回调函数 * @param clazz Entity类 * @param node 过滤条件 + * + * @return Entity对象 */ - public void find(final AsyncHandler handler, final Class clazz, final FilterNode node); + public T find(final AsyncHandler handler, final Class clazz, final FilterNode node); /** * 获取符合过滤条件单个记录, 返回null表示不存在值
@@ -921,8 +983,10 @@ public interface DataSource { * @param clazz Entity类 * @param selects 指定字段 * @param bean 过滤条件 + * + * @return Entity对象 */ - public void find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterBean bean); + public T find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterBean bean); /** * 获取符合过滤条件单个记录, 返回null表示不存在值
@@ -946,8 +1010,10 @@ public interface DataSource { * @param clazz Entity类 * @param selects 指定字段 * @param node 过滤条件 + * + * @return Entity对象 */ - public void find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterNode node); + public T find(final AsyncHandler handler, final Class clazz, final SelectColumn selects, final FilterNode node); /** * 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值
@@ -971,8 +1037,10 @@ public interface DataSource { * @param clazz Entity类 * @param column 字段名 * @param pk 主键值 + * + * @return 字段值 */ - public void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable pk); + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable pk); /** * 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值
@@ -996,8 +1064,10 @@ public interface DataSource { * @param clazz Entity类 * @param column 字段名 * @param bean 过滤条件 + * + * @return 字段值 */ - public void findColumn(final AsyncHandler handler, final Class clazz, final String column, final FilterBean bean); + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final FilterBean bean); /** * 获取符合过滤条件单个记录的单个字段值, 返回null表示不存在值
@@ -1021,8 +1091,10 @@ public interface DataSource { * @param clazz Entity类 * @param column 字段名 * @param node 过滤条件 + * + * @return 字段值 */ - public void findColumn(final AsyncHandler handler, final Class clazz, final String column, final FilterNode node); + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final FilterNode node); /** * 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值
@@ -1048,8 +1120,10 @@ public interface DataSource { * @param column 字段名 * @param defValue 默认值 * @param pk 主键值 + * + * @return 字段值 */ - public void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final Serializable pk); + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final Serializable pk); /** * 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值
@@ -1075,8 +1149,10 @@ public interface DataSource { * @param column 字段名 * @param defValue 默认值 * @param bean 过滤条件 + * + * @return 字段值 */ - public void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterBean bean); + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterBean bean); /** * 获取符合过滤条件单个记录的单个字段值, 不存在值则返回默认值
@@ -1102,8 +1178,10 @@ public interface DataSource { * @param column 字段名 * @param defValue 默认值 * @param node 过滤条件 + * + * @return 字段值 */ - public void findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterNode node); + public Serializable findColumn(final AsyncHandler handler, final Class clazz, final String column, final Serializable defValue, final FilterNode node); /** * 判断是否存在主键值的记录
@@ -1125,8 +1203,10 @@ public interface DataSource { * @param handler 回调函数 * @param clazz Entity类 * @param pk 主键值 + * + * @return 是否存在 */ - public void exists(final AsyncHandler handler, final Class clazz, final Serializable pk); + public boolean exists(final AsyncHandler handler, final Class clazz, final Serializable pk); /** * 判断是否存在符合过滤条件的记录
@@ -1148,8 +1228,10 @@ public interface DataSource { * @param handler 回调函数 * @param clazz Entity类 * @param bean 过滤条件 + * + * @return 是否存在 */ - public void exists(final AsyncHandler handler, final Class clazz, final FilterBean bean); + public boolean exists(final AsyncHandler handler, final Class clazz, final FilterBean bean); /** * 判断是否存在符合过滤条件的记录
@@ -1171,8 +1253,10 @@ public interface DataSource { * @param handler 回调函数 * @param clazz Entity类 * @param node 过滤条件 + * + * @return 是否存在 */ - public void exists(final AsyncHandler handler, final Class clazz, final FilterNode node); + public boolean exists(final AsyncHandler handler, final Class clazz, final FilterNode node); //-----------------------list set---------------------------- /** @@ -1201,8 +1285,10 @@ public interface DataSource { * @param clazz Entity类 * @param column 过滤字段名 * @param key 过滤字段值 + * + * @return 字段值的集合 */ - public void queryColumnSet(final AsyncHandler, String> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key); + public HashSet queryColumnSet(final AsyncHandler, String> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key); /** * 查询符合过滤条件记录的某个字段Set集合
@@ -1228,8 +1314,10 @@ public interface DataSource { * @param selectedColumn 指定字段 * @param clazz Entity类 * @param bean 过滤条件 + * + * @return 字段值的集合 */ - public void queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean); + public HashSet queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean); /** * 查询符合过滤条件记录的某个字段Set集合
@@ -1255,8 +1343,10 @@ public interface DataSource { * @param selectedColumn 指定字段 * @param clazz Entity类 * @param node 过滤条件 + * + * @return 字段值的集合 */ - public void queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node); + public HashSet queryColumnSet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node); /** * 查询符合过滤条件记录的某个字段List集合
@@ -1284,8 +1374,10 @@ public interface DataSource { * @param clazz Entity类 * @param column 过滤字段名 * @param key 过滤字段值 + * + * @return 字段值的集合 */ - public void queryColumnList(final AsyncHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key); + public List queryColumnList(final AsyncHandler, Serializable> handler, final String selectedColumn, final Class clazz, final String column, final Serializable key); /** * 查询符合过滤条件记录的某个字段List集合
@@ -1311,8 +1403,10 @@ public interface DataSource { * @param selectedColumn 指定字段 * @param clazz Entity类 * @param bean 过滤条件 + * + * @return 字段值的集合 */ - public void queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean); + public List queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterBean bean); /** * 查询符合过滤条件记录的某个字段List集合
@@ -1338,8 +1432,10 @@ public interface DataSource { * @param selectedColumn 指定字段 * @param clazz Entity类 * @param node 过滤条件 + * + * @return 字段值的集合 */ - public void queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node); + public List queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final FilterNode node); /** * 查询符合过滤条件记录的某个字段List集合
@@ -1367,8 +1463,10 @@ public interface DataSource { * @param clazz Entity类 * @param flipper 翻页对象 * @param bean 过滤条件 + * + * @return 字段值的集合 */ - public void queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean); + public List queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean); /** * 查询符合过滤条件记录的某个字段List集合
@@ -1396,8 +1494,10 @@ public interface DataSource { * @param clazz Entity类 * @param flipper 翻页对象 * @param node 过滤条件 + * + * @return 字段值的集合 */ - public void queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); + public List queryColumnList(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); /** * 查询符合过滤条件记录的某个字段Sheet集合
@@ -1425,8 +1525,10 @@ public interface DataSource { * @param clazz Entity类 * @param flipper 翻页对象 * @param bean 过滤条件 + * + * @return 字段值的集合 */ - public void queryColumnSheet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean); + public Sheet queryColumnSheet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean); /** * 查询符合过滤条件记录的某个字段Sheet集合
@@ -1454,8 +1556,10 @@ public interface DataSource { * @param clazz Entity类 * @param flipper 翻页对象 * @param node 过滤条件 + * + * @return 字段值的集合 */ - public void queryColumnSheet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); + public Sheet queryColumnSheet(final AsyncHandler, FilterNode> handler, final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); /** * 查询符合过滤条件记录的List集合
@@ -1479,8 +1583,10 @@ public interface DataSource { * @param clazz Entity类 * @param column 过滤字段名 * @param key 过滤字段值 + * + * @return Entity的集合 */ - public void queryList(final AsyncHandler, Serializable> handler, final Class clazz, final String column, final Serializable key); + public List queryList(final AsyncHandler, Serializable> handler, final Class clazz, final String column, final Serializable key); /** * 查询符合过滤条件记录的List集合
@@ -1502,8 +1608,10 @@ public interface DataSource { * @param handler 回调函数 * @param clazz Entity类 * @param bean 过滤条件 + * + * @return Entity的集合 */ - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterBean bean); + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterBean bean); /** * 查询符合过滤条件记录的List集合
@@ -1525,8 +1633,10 @@ public interface DataSource { * @param handler 回调函数 * @param clazz Entity类 * @param node 过滤条件 + * + * @return Entity的集合 */ - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterNode node); + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final FilterNode node); /** * 查询符合过滤条件记录的List集合
@@ -1550,8 +1660,10 @@ public interface DataSource { * @param clazz Entity类 * @param selects 指定字段 * @param bean 过滤条件 + * + * @return Entity的集合 */ - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterBean bean); + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterBean bean); /** * 查询符合过滤条件记录的List集合
@@ -1575,8 +1687,10 @@ public interface DataSource { * @param clazz Entity类 * @param selects 指定字段 * @param node 过滤条件 + * + * @return Entity的集合 */ - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterNode node); + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final FilterNode node); /** * 查询符合过滤条件记录的List集合
@@ -1602,8 +1716,10 @@ public interface DataSource { * @param flipper 翻页对象 * @param column 过滤字段名 * @param key 过滤字段值 + * + * @return Entity的集合 */ - public void queryList(final AsyncHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, final Serializable key); + public List queryList(final AsyncHandler, Serializable> handler, final Class clazz, final Flipper flipper, final String column, final Serializable key); /** * 查询符合过滤条件记录的List集合
@@ -1627,8 +1743,10 @@ public interface DataSource { * @param clazz Entity类 * @param flipper 翻页对象 * @param bean 过滤条件 + * + * @return Entity的集合 */ - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean); + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean); /** * 查询符合过滤条件记录的List集合
@@ -1640,6 +1758,8 @@ public interface DataSource { * @param node 过滤条件 * * @return Entity的集合 + * + * @return Entity的集合 */ public List queryList(final Class clazz, final Flipper flipper, final FilterNode node); @@ -1652,8 +1772,10 @@ public interface DataSource { * @param clazz Entity类 * @param flipper 翻页对象 * @param node 过滤条件 + * + * @return Entity的集合 */ - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node); + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node); /** * 查询符合过滤条件记录的List集合
@@ -1679,8 +1801,10 @@ public interface DataSource { * @param selects 指定字段 * @param flipper 翻页对象 * @param bean 过滤条件 + * + * @return Entity的集合 */ - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean); + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean); /** * 查询符合过滤条件记录的List集合
@@ -1706,8 +1830,10 @@ public interface DataSource { * @param selects 指定字段 * @param flipper 翻页对象 * @param node 过滤条件 + * + * @return Entity的集合 */ - public void queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); + public List queryList(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); //-----------------------sheet---------------------------- /** @@ -1732,8 +1858,10 @@ public interface DataSource { * @param clazz Entity类 * @param flipper 翻页对象 * @param bean 过滤条件 + * + * @return Entity的集合 */ - public void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean); + public Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterBean bean); /** * 查询符合过滤条件记录的Sheet集合
@@ -1757,8 +1885,10 @@ public interface DataSource { * @param clazz Entity类 * @param flipper 翻页对象 * @param node 过滤条件 + * + * @return Entity的集合 */ - public void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node); + public Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final Flipper flipper, final FilterNode node); /** * 查询符合过滤条件记录的Sheet集合
@@ -1784,8 +1914,10 @@ public interface DataSource { * @param selects 指定字段 * @param flipper 翻页对象 * @param bean 过滤条件 + * + * @return Entity的集合 */ - public void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean); + public Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterBean bean); /** * 查询符合过滤条件记录的Sheet集合
@@ -1811,8 +1943,10 @@ public interface DataSource { * @param selects 指定字段 * @param flipper 翻页对象 * @param node 过滤条件 + * + * @return Entity的集合 */ - public void querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); + public Sheet querySheet(final AsyncHandler, FilterNode> handler, final Class clazz, final SelectColumn selects, final Flipper flipper, final FilterNode node); //-----------------------direct---------------------------- /**