msqfX
diff --git a/Collapse file
‎JdkLearn/src/main/java/com/learnjava/lambda/LambdaMapDemo.java‎
Copy file name to clipboardExpand all lines: JdkLearn/src/main/java/com/learnjava/lambda/LambdaMapDemo.java
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎JdkLearn/src/main/java/com/learnjava/lambda/LambdaMapDemo.java‎
Copy file name to clipboardExpand all lines: JdkLearn/src/main/java/com/learnjava/lambda/LambdaMapDemo.java
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎JdkLearn/src/main/java/com/learnjava/lambda/LambdaMapMerge.java‎
Copy file name to clipboard
+58Lines changed: 58 additions & 0 deletions b/Collapse file
‎JdkLearn/src/main/java/com/learnjava/lambda/LambdaMapMerge.java‎
Copy file name to clipboard
+58Lines changed: 58 additions & 0 deletions
@@ -41,7 +41,7 @@ public static void test01() {
     }
 
     /**
-     * HashMap的merge方法，如果key相同，则通过merge来对key相同的袁术进行处理
+     * HashMap的merge方法，如果key相同，则通过merge来对key相同的元素进行处理
      */
     public static void test02() {
         String key = "money";
 
@@ -0,0 +1,58 @@
+package com.learnjava.lambda;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 关于Map的合并操作
+ *
+ * @author lhy
+ * @date 2021/7/20
+ */
+public class LambdaMapMerge {
+
+    public static void main(String[] args) {
+//        mapMerge();
+//        mapMerge2();
+    }
+
+    /**
+     * value为int类型的map merge操作，将两个map，相同key merge在一起
+     *
+     * key：string
+     * value：int
+     */
+    public static void mapMerge() {
+        Map<String, Integer> map1= new HashMap<>();
+        map1.put("one",1);
+        map1.put("two",2);
+        map1.put("three",3);
+        Map<String,Integer> map2= new HashMap<>();
+        map2.put("one",1);
+        map2.put("two",2);
+
+        map1.forEach((key, value) -> map2.merge(key, value, Integer::sum));
+        System.out.println(map2);
+    }
+
+    /**
+     * value为int类型的map merge操作，将两个map，相同key merge在一起
+     *
+     * key：string
+     * value：String
+     */
+    public static void mapMerge2() {
+        Map<String,String> map1= new HashMap<>();
+        map1.put("one","1");
+        map1.put("two","2");
+        map1.put("three","3");
+        Map<String,String> map2= new HashMap<>();
+        map2.put("one","1");
+        map2.put("two","2");
+
+        map1.forEach((key, value) -> map2.merge(key, value,(total, num) -> String.valueOf(Integer.parseInt(total) + Integer.parseInt(num))));
+
+        System.out.println(map2);
+
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static void test01() {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`44`		`- * HashMap的merge方法，如果key相同，则通过merge来对key相同的袁术进行处理`
	`44`	`+ * HashMap的merge方法，如果key相同，则通过merge来对key相同的元素进行处理`
`45`	`45`	`*/`
`46`	`46`	`public static void test02() {`
`47`	`47`	`String key = "money";`