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

Browse Source
This commit is contained in:
wentch
2015-12-10 11:53:41 +08:00
parent af991ed7eb
commit b6bc4182e9
3 changed files with 39 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/org/redkale/service/DataSourceService.java
View File

@@ -155,18 +155,18 @@ public class DataSourceService implements DataSource, Service {
} }
@Override @Override
public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(Class<T> entityClass, String keyColumn, Reckon reckon, String reckonColumn) { public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(Class<T> entityClass, String keyColumn, Reckon reckon, String reckonColumn) {
return source.getMapResult(entityClass, keyColumn, reckon, reckonColumn); return source.queryColumnMap(entityClass, keyColumn, reckon, reckonColumn);
} }
@Override @Override
public final <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(Class<T> entityClass, String keyColumn, Reckon reckon, String reckonColumn, FilterBean bean) { public final <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(Class<T> entityClass, String keyColumn, Reckon reckon, String reckonColumn, FilterBean bean) {
return getMapResult(entityClass, keyColumn, reckon, reckonColumn, FilterNodeBean.createFilterNode(bean)); return queryColumnMap(entityClass, keyColumn, reckon, reckonColumn, FilterNodeBean.createFilterNode(bean));
} }
@Override @Override
public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(Class<T> entityClass, String keyColumn, Reckon reckon, String reckonColumn, FilterNode node) { public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(Class<T> entityClass, String keyColumn, Reckon reckon, String reckonColumn, FilterNode node) {
return source.getMapResult(entityClass, keyColumn, reckon, reckonColumn, node); return source.queryColumnMap(entityClass, keyColumn, reckon, reckonColumn, node);
} }
@Override @Override
@@ -210,55 +210,35 @@ public class DataSourceService implements DataSource, Service {
} }
@Override @Override
public <T, V> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, String column, Serializable key) { public <T, V extends Serializable> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, String column, Serializable key) {
return source.queryColumnSet(selectedColumn, clazz, column, key); return source.queryColumnSet(selectedColumn, clazz, column, key);
} }
@Override @Override
public <T, V> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, FilterNode node) { public <T, V extends Serializable> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, FilterNode node) {
return source.queryColumnSet(selectedColumn, clazz, node); return source.queryColumnSet(selectedColumn, clazz, node);
} }
@Override @Override
public final <T, V> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, FilterBean bean) { public final <T, V extends Serializable> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, FilterBean bean) {
return queryColumnSet(selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); return queryColumnSet(selectedColumn, clazz, FilterNodeBean.createFilterNode(bean));
} }
@Override @Override
public <T, V> List<V> queryColumnList(String selectedColumn, Class<T> clazz, String column, Serializable key) { public <T, V extends Serializable> List<V> queryColumnList(String selectedColumn, Class<T> clazz, String column, Serializable key) {
return source.queryColumnList(selectedColumn, clazz, column, key); return source.queryColumnList(selectedColumn, clazz, column, key);
} }
@Override @Override
public <T, V> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterNode node) { public <T, V extends Serializable> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterNode node) {
return source.queryColumnList(selectedColumn, clazz, node); return source.queryColumnList(selectedColumn, clazz, node);
} }
@Override @Override
public final <T, V> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterBean bean) { public final <T, V extends Serializable> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterBean bean) {
return queryColumnList(selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); return queryColumnList(selectedColumn, clazz, FilterNodeBean.createFilterNode(bean));
} }
@Override
public <K extends Serializable, T> Map<K, T> queryMap(Class<T> clazz, FilterNode node) {
return source.queryMap(clazz, node);
}
@Override
public final <K extends Serializable, T> Map<K, T> queryMap(Class<T> clazz, FilterBean bean) {
return queryMap(clazz, FilterNodeBean.createFilterNode(bean));
}
@Override
public <K extends Serializable, T> Map<K, T> queryMap(Class<T> clazz, SelectColumn selects, FilterNode node) {
return source.queryMap(clazz, selects, node);
}
@Override
public final <K extends Serializable, T> Map<K, T> queryMap(Class<T> clazz, SelectColumn selects, FilterBean bean) {
return queryMap(clazz, selects, FilterNodeBean.createFilterNode(bean));
}
@Override @Override
public <T> List<T> queryList(Class<T> clazz, String column, Serializable key) { public <T> List<T> queryList(Class<T> clazz, String column, Serializable key) {
return source.queryList(clazz, column, key); return source.queryList(clazz, column, key);
@@ -310,12 +290,12 @@ public class DataSourceService implements DataSource, Service {
} }
@Override @Override
public final <T, V> Sheet<V> queryColumnSheet(String selectedColumn, Class<T> clazz, Flipper flipper, FilterBean bean) { public final <T, V extends Serializable> Sheet<V> queryColumnSheet(String selectedColumn, Class<T> clazz, Flipper flipper, FilterBean bean) {
return queryColumnSheet(selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); return queryColumnSheet(selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean));
} }
@Override @Override
public <T, V> Sheet<V> queryColumnSheet(String selectedColumn, Class<T> clazz, Flipper flipper, FilterNode node) { public <T, V extends Serializable> Sheet<V> queryColumnSheet(String selectedColumn, Class<T> clazz, Flipper flipper, FilterNode node) {
return source.queryColumnSheet(selectedColumn, clazz, flipper, node); return source.queryColumnSheet(selectedColumn, clazz, flipper, node);
} }

57
src/org/redkale/source/DataDefaultSource.java
View File

@@ -1108,19 +1108,19 @@ public final class DataDefaultSource implements DataSource, Nameable, Function<C
} }
} }
//-----------------------getMapResult----------------------------- //-----------------------queryColumnMap-----------------------------
@Override @Override
public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(final Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn) { public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn) {
return getMapResult(entityClass, keyColumn, reckon, reckonColumn, (FilterNode) null); return queryColumnMap(entityClass, keyColumn, reckon, reckonColumn, (FilterNode) null);
} }
@Override @Override
public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(final Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterBean bean) { public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterBean bean) {
return getMapResult(entityClass, keyColumn, reckon, reckonColumn, FilterNodeBean.createFilterNode(bean)); return queryColumnMap(entityClass, keyColumn, reckon, reckonColumn, FilterNodeBean.createFilterNode(bean));
} }
@Override @Override
public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(final Class<T> entityClass, final String keyColumn, final Reckon reckon, final String reckonColumn, FilterNode node) { public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final Class<T> entityClass, final String keyColumn, final Reckon reckon, final String reckonColumn, FilterNode node) {
final Connection conn = createReadSQLConnection(); final Connection conn = createReadSQLConnection();
try { try {
final EntityInfo info = loadEntityInfo(entityClass); final EntityInfo info = loadEntityInfo(entityClass);
@@ -1290,64 +1290,35 @@ public final class DataDefaultSource implements DataSource, Nameable, Function<C
//-----------------------list set---------------------------- //-----------------------list set----------------------------
@Override @Override
public <T, V> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, String column, Serializable key) { public <T, V extends Serializable> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, String column, Serializable key) {
return queryColumnSet(selectedColumn, clazz, FilterNode.create(column, key)); return queryColumnSet(selectedColumn, clazz, FilterNode.create(column, key));
} }
@Override @Override
public <T, V> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, FilterBean bean) { public <T, V extends Serializable> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, FilterBean bean) {
return new LinkedHashSet<>(queryColumnList(selectedColumn, clazz, bean)); return new LinkedHashSet<>(queryColumnList(selectedColumn, clazz, bean));
} }
@Override @Override
public <T, V> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, FilterNode node) { public <T, V extends Serializable> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, FilterNode node) {
return new LinkedHashSet<>(queryColumnList(selectedColumn, clazz, node)); return new LinkedHashSet<>(queryColumnList(selectedColumn, clazz, node));
} }
@Override @Override
public <T, V> List<V> queryColumnList(String selectedColumn, Class<T> clazz, String column, Serializable key) { public <T, V extends Serializable> List<V> queryColumnList(String selectedColumn, Class<T> clazz, String column, Serializable key) {
return queryColumnList(selectedColumn, clazz, FilterNode.create(column, key)); return queryColumnList(selectedColumn, clazz, FilterNode.create(column, key));
} }
@Override @Override
public <T, V> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterBean bean) { public <T, V extends Serializable> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterBean bean) {
return (List<V>) queryColumnSheet(selectedColumn, clazz, null, bean).list(true); return (List<V>) queryColumnSheet(selectedColumn, clazz, null, bean).list(true);
} }
@Override @Override
public <T, V> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterNode node) { public <T, V extends Serializable> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterNode node) {
return (List<V>) queryColumnSheet(selectedColumn, clazz, null, node).list(true); return (List<V>) queryColumnSheet(selectedColumn, clazz, null, node).list(true);
} }
/**
* 根据过滤对象FilterBean查询对象集合
*
* @param <K>
* @param <T>
* @param clazz
* @param bean
* @return
*/
@Override
public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final FilterBean bean) {
return queryMap(clazz, null, bean);
}
@Override
public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final FilterNode node) {
return queryMap(clazz, null, node);
}
@Override
public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterBean bean) {
return formatMap(clazz, queryList(clazz, selects, null, bean));
}
@Override
public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterNode node) {
return formatMap(clazz, queryList(clazz, selects, null, node));
}
private <K extends Serializable, T> Map<K, T> formatMap(final Class<T> clazz, Collection<T> list) { private <K extends Serializable, T> Map<K, T> formatMap(final Class<T> clazz, Collection<T> list) {
Map<K, T> map = new LinkedHashMap<>(); Map<K, T> map = new LinkedHashMap<>();
if (list == null || list.isEmpty()) return map; if (list == null || list.isEmpty()) return map;
@@ -1447,12 +1418,12 @@ public final class DataDefaultSource implements DataSource, Nameable, Function<C
* @return * @return
*/ */
@Override @Override
public <T, V> Sheet<V> queryColumnSheet(String selectedColumn, Class<T> clazz, final Flipper flipper, final FilterBean bean) { public <T, V extends Serializable> Sheet<V> queryColumnSheet(String selectedColumn, Class<T> clazz, final Flipper flipper, final FilterBean bean) {
return queryColumnSheet(selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); return queryColumnSheet(selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean));
} }
@Override @Override
public <T, V> Sheet<V> queryColumnSheet(String selectedColumn, Class<T> clazz, final Flipper flipper, final FilterNode node) { public <T, V extends Serializable> Sheet<V> queryColumnSheet(String selectedColumn, Class<T> clazz, final Flipper flipper, final FilterNode node) {
Sheet<T> sheet = querySheet(true, true, clazz, SelectColumn.createIncludes(selectedColumn), flipper, node); Sheet<T> sheet = querySheet(true, true, clazz, SelectColumn.createIncludes(selectedColumn), flipper, node);
final Sheet<V> rs = new Sheet<>(); final Sheet<V> rs = new Sheet<>();
if (sheet.isEmpty()) return rs; if (sheet.isEmpty()) return rs;

39
src/org/redkale/source/DataSource.java
View File

@@ -116,11 +116,11 @@ public interface DataSource {
public Number getNumberResult(final Class entityClass, final Reckon reckon, final String column, FilterNode node); public Number getNumberResult(final Class entityClass, final Reckon reckon, final String column, FilterNode node);
public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn); public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn);
public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterBean bean); public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, final FilterBean bean);
public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterNode node); public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, final FilterNode node);
//-----------------------find---------------------------- //-----------------------find----------------------------
/** /**
@@ -159,17 +159,17 @@ public interface DataSource {
* @param key * @param key
* @return * @return
*/ */
public <T, V> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, String column, Serializable key); public <T, V extends Serializable> HashSet<V> queryColumnSet(final String selectedColumn, final Class<T> clazz, final String column, final Serializable key);
public <T, V> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, FilterNode node); public <T, V extends Serializable> HashSet<V> queryColumnSet(final String selectedColumn, final Class<T> clazz, final FilterNode node);
public <T, V> HashSet<V> queryColumnSet(String selectedColumn, Class<T> clazz, FilterBean bean); public <T, V extends Serializable> HashSet<V> queryColumnSet(final String selectedColumn, final Class<T> clazz, final FilterBean bean);
public <T, V> List<V> queryColumnList(String selectedColumn, Class<T> clazz, String column, Serializable key); public <T, V extends Serializable> List<V> queryColumnList(final String selectedColumn, final Class<T> clazz, final String column, final Serializable key);
public <T, V> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterNode node); public <T, V extends Serializable> List<V> queryColumnList(final String selectedColumn, final Class<T> clazz, final FilterNode node);
public <T, V> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterBean bean); public <T, V extends Serializable> List<V> queryColumnList(final String selectedColumn, final Class<T> clazz, final FilterBean bean);
/** /**
* 根据指定参数查询对象某个字段的集合 * 根据指定参数查询对象某个字段的集合
@@ -182,26 +182,9 @@ public interface DataSource {
* @param bean * @param bean
* @return * @return
*/ */
public <T, V> Sheet<V> queryColumnSheet(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterBean bean); public <T, V extends Serializable> Sheet<V> queryColumnSheet(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterBean bean);
public <T, V> Sheet<V> queryColumnSheet(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node); public <T, V extends Serializable> Sheet<V> queryColumnSheet(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node);
/**
* Map 接口
* <p>
* @param <K>
* @param <T>
* @param clazz
* @param node
* @return
*/
public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final FilterNode node);
public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final FilterBean bean);
public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterNode node);
public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterBean bean);
/** /**
* 根据指定字段值查询对象集合 * 根据指定字段值查询对象集合