From af991ed7eb2500a9685a9bdabfab54fcb754a640 Mon Sep 17 00:00:00 2001
From: wentch <22250530@qq.com>
Date: Thu, 10 Dec 2015 11:38:04 +0800
Subject: [PATCH]

---
 .../redkale/service/DataSourceService.java    |  6 ++--
 src/org/redkale/source/DataDefaultSource.java | 10 +++----
 src/org/redkale/source/DataSource.java        | 29 ++++++++++++-------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/org/redkale/service/DataSourceService.java b/src/org/redkale/service/DataSourceService.java
index 5cb3815c6..206d81129 100644
--- a/src/org/redkale/service/DataSourceService.java
+++ b/src/org/redkale/service/DataSourceService.java
@@ -155,17 +155,17 @@ public class DataSourceService implements DataSource, Service {
     }
 
     @Override
-    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, String keyColumn, Reckon reckon, String reckonColumn) {
+    public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(Class<T> entityClass, String keyColumn, Reckon reckon, String reckonColumn) {
         return source.getMapResult(entityClass, keyColumn, reckon, reckonColumn);
     }
 
     @Override
-    public final <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, String keyColumn, Reckon reckon, String reckonColumn, FilterBean bean) {
+    public final <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(Class<T> entityClass, String keyColumn, Reckon reckon, String reckonColumn, FilterBean bean) {
         return getMapResult(entityClass, keyColumn, reckon, reckonColumn, FilterNodeBean.createFilterNode(bean));
     }
 
     @Override
-    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, String keyColumn, Reckon reckon, String reckonColumn, FilterNode node) {
+    public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(Class<T> entityClass, String keyColumn, Reckon reckon, String reckonColumn, FilterNode node) {
         return source.getMapResult(entityClass, keyColumn, reckon, reckonColumn, node);
     }
 
diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java
index 0c3bcb1a4..53a978b9c 100644
--- a/src/org/redkale/source/DataDefaultSource.java
+++ b/src/org/redkale/source/DataDefaultSource.java
@@ -1110,17 +1110,17 @@ public final class DataDefaultSource implements DataSource, Nameable, Function<C
 
     //-----------------------getMapResult-----------------------------
     @Override
-    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn) {
+    public <T, K extends Serializable, N extends Number> Map<K, N> getMapResult(final Class<T> entityClass, final String keyColumn, Reckon reckon, final String reckonColumn) {
         return getMapResult(entityClass, keyColumn, reckon, reckonColumn, (FilterNode) null);
     }
 
     @Override
-    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, FilterBean bean) {
+    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) {
         return getMapResult(entityClass, keyColumn, reckon, reckonColumn, FilterNodeBean.createFilterNode(bean));
     }
 
     @Override
-    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(final Class entityClass, final String keyColumn, final Reckon reckon, final String reckonColumn, FilterNode node) {
+    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) {
         final Connection conn = createReadSQLConnection();
         try {
             final EntityInfo info = loadEntityInfo(entityClass);
@@ -1138,12 +1138,12 @@ public final class DataDefaultSource implements DataSource, Nameable, Function<C
                     + " FROM " + info.getTable() + " a" + (join == null ? "" : join) + ((where == null || where.length() == 0) ? "" : (" WHERE " + where)) + " GROUP BY a." + sqlkey;
             if (debug.get() && info.isLoggable(Level.FINEST)) logger.finest(entityClass.getSimpleName() + " single sql=" + sql);
             final PreparedStatement prestmt = conn.prepareStatement(sql);
-            Map<K, V> rs = new LinkedHashMap<>();
+            Map<K, N> rs = new LinkedHashMap<>();
             ResultSet set = prestmt.executeQuery();
             ResultSetMetaData rsd = set.getMetaData();
             boolean smallint = rsd.getColumnType(1) == Types.SMALLINT;
             while (set.next()) {
-                rs.put((K) (smallint ? set.getShort(1) : set.getObject(1)), (V) set.getObject(2));
+                rs.put((K) (smallint ? set.getShort(1) : set.getObject(1)), (N) set.getObject(2));
             }
             set.close();
             prestmt.close();
diff --git a/src/org/redkale/source/DataSource.java b/src/org/redkale/source/DataSource.java
index 94813b223..59ffcf53d 100644
--- a/src/org/redkale/source/DataSource.java
+++ b/src/org/redkale/source/DataSource.java
@@ -116,11 +116,11 @@ public interface DataSource {
 
     public Number getNumberResult(final Class entityClass, final Reckon reckon, final String column, FilterNode node);
 
-    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class 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);
 
-    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, 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, FilterBean bean);
 
-    public <K extends Serializable, V extends Number> Map<K, V> getMapResult(Class entityClass, final String keyColumn, Reckon reckon, final String reckonColumn, 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, FilterNode node);
 
     //-----------------------find----------------------------
     /**
@@ -171,6 +171,21 @@ public interface DataSource {
 
     public <T, V> List<V> queryColumnList(String selectedColumn, Class<T> clazz, FilterBean bean);
 
+    /**
+     * 根据指定参数查询对象某个字段的集合
+     * <p>
+     * @param <T>
+     * @param <V>
+     * @param selectedColumn
+     * @param clazz
+     * @param flipper
+     * @param bean
+     * @return
+     */
+    public <T, V> 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);
+
     /**
      * Map 接口
      * <p>
@@ -219,20 +234,14 @@ public interface DataSource {
 
     //-----------------------sheet----------------------------
     /**
-     * 根据指定参数查询对象某个字段的集合
+     * 根据指定参数查询对象某个对象的集合页
      * <p>
      * @param <T>
-     * @param <V>
-     * @param selectedColumn
      * @param clazz
      * @param flipper
      * @param bean
      * @return
      */
-    public <T, V> 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> Sheet<T> querySheet(final Class<T> clazz, final Flipper flipper, final FilterBean bean);
 
     public <T> Sheet<T> querySheet(final Class<T> clazz, final Flipper flipper, final FilterNode node);