From fc2dfa1a8a5c91cf3ea8eae8025ee6712c0566ec Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Sat, 8 Oct 2016 12:30:45 +0800
Subject: [PATCH]

---
 .../redkale/service/DataSourceService.java    | 15 ++++++
 src/org/redkale/source/DataDefaultSource.java | 23 +++++++--
 src/org/redkale/source/DataSource.java        |  6 +++
 src/org/redkale/source/EntityCache.java       | 49 ++++++++++++-------
 4 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/src/org/redkale/service/DataSourceService.java b/src/org/redkale/service/DataSourceService.java
index b63d6da6d..6e47e1e7a 100644
--- a/src/org/redkale/service/DataSourceService.java
+++ b/src/org/redkale/service/DataSourceService.java
@@ -103,6 +103,21 @@ public class DataSourceService implements DataSource, Service, AutoCloseable {
         return source.getNumberResult(entityClass, func, column, node);
     }
 
+    @Override
+    public Number getNumberResult(final Class entityClass, FilterFunc func, final Number defVal, final String column) {
+        return source.getNumberResult(entityClass, func, defVal, column);
+    }
+
+    @Override
+    public final Number getNumberResult(final Class entityClass, FilterFunc func, final Number defVal, final String column, FilterBean bean) {
+        return getNumberResult(entityClass, func, defVal, column, FilterNodeBean.createFilterNode(bean));
+    }
+
+    @Override
+    public Number getNumberResult(final Class entityClass, FilterFunc func, final Number defVal, final String column, FilterNode node) {
+        return source.getNumberResult(entityClass, func, defVal, column, node);
+    }
+
     @Override
     public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final Class<T> entityClass, final String keyColumn, FilterFunc func, final String funcColumn) {
         return source.queryColumnMap(entityClass, keyColumn, func, funcColumn);
diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java
index e505e3d02..2ac84af59 100644
--- a/src/org/redkale/source/DataDefaultSource.java
+++ b/src/org/redkale/source/DataDefaultSource.java
@@ -1035,23 +1035,38 @@ public final class DataDefaultSource implements DataSource, Function<Class, Enti
     //-----------------------getNumberResult-----------------------------
     @Override
     public Number getNumberResult(final Class entityClass, final FilterFunc func, final String column) {
-        return getNumberResult(entityClass, func, column, (FilterNode) null);
+        return getNumberResult(entityClass, func, null, column, (FilterNode) null);
     }
 
     @Override
     public Number getNumberResult(final Class entityClass, final FilterFunc func, final String column, FilterBean bean) {
-        return getNumberResult(entityClass, func, column, FilterNodeBean.createFilterNode(bean));
+        return getNumberResult(entityClass, func, null, column, FilterNodeBean.createFilterNode(bean));
     }
 
     @Override
     public Number getNumberResult(final Class entityClass, final FilterFunc func, final String column, final FilterNode node) {
+        return getNumberResult(entityClass, func, null, column, node);
+    }
+
+    @Override
+    public Number getNumberResult(final Class entityClass, final FilterFunc func, final Number defVal, final String column) {
+        return getNumberResult(entityClass, func, defVal, column, (FilterNode) null);
+    }
+
+    @Override
+    public Number getNumberResult(final Class entityClass, final FilterFunc func, final Number defVal, final String column, FilterBean bean) {
+        return getNumberResult(entityClass, func, defVal, column, FilterNodeBean.createFilterNode(bean));
+    }
+
+    @Override
+    public Number getNumberResult(final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node) {
         final Connection conn = createReadSQLConnection();
         try {
             final EntityInfo info = loadEntityInfo(entityClass);
             final EntityCache cache = info.getCache();
             if (cache != null && (info.isVirtualEntity() || cache.isFullLoaded())) {
                 if (node == null || node.isCacheUseable(this)) {
-                    return cache.getNumberResult(func, column, node);
+                    return cache.getNumberResult(func, defVal, column, node);
                 }
             }
             final Map<Class, String> joinTabalis = node == null ? null : node.getJoinTabalis();
@@ -1061,7 +1076,7 @@ public final class DataDefaultSource implements DataSource, Function<Class, Enti
                 + (join == null ? "" : join) + ((where == null || where.length() == 0) ? "" : (" WHERE " + where));
             if (debug.get() && info.isLoggable(Level.FINEST)) logger.finest(entityClass.getSimpleName() + " single sql=" + sql);
             final PreparedStatement prestmt = conn.prepareStatement(sql);
-            Number rs = null;
+            Number rs = defVal;
             ResultSet set = prestmt.executeQuery();
             if (set.next()) {
                 rs = (Number) set.getObject(1);
diff --git a/src/org/redkale/source/DataSource.java b/src/org/redkale/source/DataSource.java
index cfad0019c..fd8760b2f 100644
--- a/src/org/redkale/source/DataSource.java
+++ b/src/org/redkale/source/DataSource.java
@@ -84,6 +84,12 @@ public interface DataSource {
 
     public Number getNumberResult(final Class entityClass, final FilterFunc func, final String column, final FilterNode node);
 
+    public Number getNumberResult(final Class entityClass, final FilterFunc func, final Number defVal, final String column);
+
+    public Number getNumberResult(final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterBean bean);
+
+    public Number getNumberResult(final Class entityClass, final FilterFunc func, final Number defVal, final String column, final FilterNode node);
+
     public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn);
 
     public <T, K extends Serializable, N extends Number> Map<K, N> queryColumnMap(final Class<T> entityClass, final String keyColumn, final FilterFunc func, final String funcColumn, final FilterBean bean);
diff --git a/src/org/redkale/source/EntityCache.java b/src/org/redkale/source/EntityCache.java
index d7b2817b0..87a33e82c 100644
--- a/src/org/redkale/source/EntityCache.java
+++ b/src/org/redkale/source/EntityCache.java
@@ -220,7 +220,7 @@ public final class EntityCache<T> {
         return rs;
     }
 
-    public <V> Number getNumberResult(final FilterFunc func, final String column, FilterNode node) {
+    public <V> Number getNumberResult(final FilterFunc func, final Number defResult, final String column, final FilterNode node) {
         final Attribute<T, Serializable> attr = column == null ? null : info.getAttribute(column);
         final Predicate<T> filter = node == null ? null : node.createPredicate(this);
         Stream<T> stream = this.list.stream();
@@ -228,15 +228,20 @@ public final class EntityCache<T> {
         switch (func) {
             case AVG:
                 if (attr.type() == int.class || attr.type() == Integer.class) {
-                    return (int) stream.mapToInt(x -> (Integer) attr.get(x)).average().orElse(0);
+                    OptionalDouble rs = stream.mapToInt(x -> (Integer) attr.get(x)).average();
+                    return rs.isPresent() ? (int) rs.getAsDouble() : defResult;
                 } else if (attr.type() == long.class || attr.type() == Long.class) {
-                    return (long) stream.mapToLong(x -> (Long) attr.get(x)).average().orElse(0);
+                    OptionalDouble rs = stream.mapToLong(x -> (Long) attr.get(x)).average();
+                    return rs.isPresent() ? (long) rs.getAsDouble() : defResult;
                 } else if (attr.type() == short.class || attr.type() == Short.class) {
-                    return (short) stream.mapToInt(x -> ((Short) attr.get(x)).intValue()).average().orElse(0);
+                    OptionalDouble rs = stream.mapToInt(x -> ((Short) attr.get(x)).intValue()).average();
+                    return rs.isPresent() ? (short) rs.getAsDouble() : defResult;
                 } else if (attr.type() == float.class || attr.type() == Float.class) {
-                    return (float) stream.mapToDouble(x -> ((Float) attr.get(x)).doubleValue()).average().orElse(0);
+                    OptionalDouble rs = stream.mapToDouble(x -> ((Float) attr.get(x)).doubleValue()).average();
+                    return rs.isPresent() ? (float) rs.getAsDouble() : defResult;
                 } else if (attr.type() == double.class || attr.type() == Double.class) {
-                    return stream.mapToDouble(x -> (Double) attr.get(x)).average().orElse(0);
+                    OptionalDouble rs = stream.mapToDouble(x -> (Double) attr.get(x)).average();
+                    return rs.isPresent() ? rs.getAsDouble() : defResult;
                 }
                 throw new RuntimeException("getNumberResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type());
             case COUNT:
@@ -246,29 +251,39 @@ public final class EntityCache<T> {
 
             case MAX:
                 if (attr.type() == int.class || attr.type() == Integer.class) {
-                    return stream.mapToInt(x -> (Integer) attr.get(x)).max().orElse(0);
+                    OptionalInt rs = stream.mapToInt(x -> (Integer) attr.get(x)).max();
+                    return rs.isPresent() ? rs.getAsInt() : defResult;
                 } else if (attr.type() == long.class || attr.type() == Long.class) {
-                    return stream.mapToLong(x -> (Long) attr.get(x)).max().orElse(0);
+                    OptionalLong rs = stream.mapToLong(x -> (Long) attr.get(x)).max();
+                    return rs.isPresent() ? rs.getAsLong() : defResult;
                 } else if (attr.type() == short.class || attr.type() == Short.class) {
-                    return (short) stream.mapToInt(x -> ((Short) attr.get(x)).intValue()).max().orElse(0);
+                    OptionalInt rs = stream.mapToInt(x -> ((Short) attr.get(x)).intValue()).max();
+                    return rs.isPresent() ? (short) rs.getAsInt() : defResult;
                 } else if (attr.type() == float.class || attr.type() == Float.class) {
-                    return (float) stream.mapToDouble(x -> ((Float) attr.get(x)).doubleValue()).max().orElse(0);
+                    OptionalDouble rs = stream.mapToDouble(x -> ((Float) attr.get(x)).doubleValue()).max();
+                    return rs.isPresent() ? (float) rs.getAsDouble() : defResult;
                 } else if (attr.type() == double.class || attr.type() == Double.class) {
-                    return stream.mapToDouble(x -> (Double) attr.get(x)).max().orElse(0);
+                    OptionalDouble rs = stream.mapToDouble(x -> (Double) attr.get(x)).max();
+                    return rs.isPresent() ? rs.getAsDouble() : defResult;
                 }
                 throw new RuntimeException("getNumberResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type());
 
             case MIN:
                 if (attr.type() == int.class || attr.type() == Integer.class) {
-                    return stream.mapToInt(x -> (Integer) attr.get(x)).min().orElse(0);
+                    OptionalInt rs = stream.mapToInt(x -> (Integer) attr.get(x)).min();
+                    return rs.isPresent() ? rs.getAsInt() : defResult;
                 } else if (attr.type() == long.class || attr.type() == Long.class) {
-                    return stream.mapToLong(x -> (Long) attr.get(x)).min().orElse(0);
+                    OptionalLong rs = stream.mapToLong(x -> (Long) attr.get(x)).min();
+                    return rs.isPresent() ? rs.getAsLong() : defResult;
                 } else if (attr.type() == short.class || attr.type() == Short.class) {
-                    return (short) stream.mapToInt(x -> ((Short) attr.get(x)).intValue()).min().orElse(0);
+                    OptionalInt rs = stream.mapToInt(x -> ((Short) attr.get(x)).intValue()).min();
+                    return rs.isPresent() ? (short) rs.getAsInt() : defResult;
                 } else if (attr.type() == float.class || attr.type() == Float.class) {
-                    return (float) stream.mapToDouble(x -> ((Float) attr.get(x)).doubleValue()).min().orElse(0);
+                    OptionalDouble rs = stream.mapToDouble(x -> ((Float) attr.get(x)).doubleValue()).min();
+                    return rs.isPresent() ? (float) rs.getAsDouble() : defResult;
                 } else if (attr.type() == double.class || attr.type() == Double.class) {
-                    return stream.mapToDouble(x -> (Double) attr.get(x)).min().orElse(0);
+                    OptionalDouble rs = stream.mapToDouble(x -> (Double) attr.get(x)).min();
+                    return rs.isPresent() ? rs.getAsDouble() : defResult;
                 }
                 throw new RuntimeException("getNumberResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type());
 
@@ -286,7 +301,7 @@ public final class EntityCache<T> {
                 }
                 throw new RuntimeException("getNumberResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type());
         }
-        return -1;
+        return defResult;
     }
 
     public Sheet<T> querySheet(final SelectColumn selects, final Flipper flipper, final FilterNode node) {