接口文档的支持

yzg-util-base/src/main/java/com/yanzuoguang/util/vo/DataDaoKey.java

@@ -6,7 +6,7 @@ package com.yanzuoguang.util.vo;
  * @param <T>
  * @author 颜佐光
  */
-public interface DataDaoKey<T extends Object> {
+public interface DataDaoKey<T> {
     /**
      * 获取关键字
      *

yzg-util-base/src/main/java/com/yanzuoguang/util/vo/DataDaoKeyConvert.java

+package com.yanzuoguang.util.vo;
+
+/**
+ * 获取关键字
+ *
+ * @param <T>
+ * @author 颜佐光
+ */
+public interface DataDaoKeyConvert<T, M> extends DataDaoKey<T> {
+    /**
+     * 获取关键字
+     *
+     * @param from 来源对象
+     * @return
+     */
+    T convert(M from);
+}

yzg-util-base/src/main/java/com/yanzuoguang/util/vo/DataDaoVo.java

@@ -25,31 +25,54 @@ public class DataDaoVo<T> {
      * @param keyFunc
      */
     public static <T> DataDaoVo<T> init(List<T> hisitories, List<T> nows, DataDaoKey<T> keyFunc) {
-        Map<String, T> mapHistory = new HashMap<>((hisitories.size() + nows.size()) / 2);
+        // 定义缓存集合
+        Map<String, T> mapHistory = new HashMap<>(10);
         // 历史数据处理
-        for (T his : hisitories) {
-            String key = keyFunc.getKey(his);
-            T t = mapHistory.get(key);
-            mapHistory.put(key, t);
+        if (hisitories != null) {
+            for (T his : hisitories) {
+                String key = keyFunc.getKey(his);
+                T t = mapHistory.get(key);
+                mapHistory.put(key, t);
+            }
         }
         DataDaoVo<T> res = new DataDaoVo<T>();
         // 返回集
-        for (T now : nows) {
-            String key = keyFunc.getKey(now);
-            T his = mapHistory.get(key);
-            if (his == null) {
-                res.creates.add(now);
-                res.mapNow.put(key, now);
-            } else {
-                keyFunc.set(his, now);
-                res.updates.add(his);
-                res.mapNow.put(key, his);
+        if (nows != null) {
+            for (T now : nows) {
+                String key = keyFunc.getKey(now);
+                T his = mapHistory.get(key);
+                if (his == null) {
+                    res.creates.add(now);
+                    res.mapNow.put(key, now);
+                } else {
+                    keyFunc.set(his, now);
+                    res.updates.add(his);
+                    res.mapNow.put(key, his);
+                }
             }
         }
         res.removes.addAll(mapHistory.values());
 
         return res;
+    }
+
 
+    /**
+     * 初始话对象
+     *
+     * @param hisitories
+     * @param nows
+     * @param keyFunc
+     */
+    public static <T, M> DataDaoVo<T> init(List<T> hisitories, List<M> nows, DataDaoKeyConvert<T, M> keyFunc) {
+        List<T> toNows = new ArrayList<>(10);
+        if (nows != null) {
+            for (M m : nows) {
+                T t = keyFunc.convert(m);
+                toNows.add(t);
+            }
+        }
+        return init(hisitories, toNows, keyFunc);
     }
 
     /**