From c7795eb09f3059f1a0310bc817e2fa0e9e64d29e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 26 六月 2025 21:15:01 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

---
 src/main/java/com/whyc/util/ActionUtil.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/whyc/util/ActionUtil.java b/src/main/java/com/whyc/util/ActionUtil.java
index fd4edb8..278d4c3 100644
--- a/src/main/java/com/whyc/util/ActionUtil.java
+++ b/src/main/java/com/whyc/util/ActionUtil.java
@@ -23,6 +23,9 @@
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import com.whyc.pojo.db_user.User;
 
 public class ActionUtil {
@@ -678,7 +681,14 @@
 			System.out.println(date);
 		}*/
 		//System.out.println(toCamelCase("user_name_and_age"));
-		Date time1=getDateAdd(new Date(),-10);
-		System.out.println(ActionUtil.sdf.format(time1));
+		/*Date time1=getDateAdd(new Date(),-10);
+		System.out.println(ActionUtil.sdf.format(time1));*/
+		Map<String, List<String>> map = new HashMap<>();
+		map.put("key1", Stream.of("value1", "value2").collect(Collectors.toList()));
+		map.put("key2", Stream.of("value3", "value4").collect(Collectors.toList()));
+		String result = map.values().stream()
+				.flatMap(List::stream)
+				.collect(Collectors.joining(","));
+		System.out.println( result);
 	}
 }	

--
Gitblit v1.9.1