From 64f046ed41c2ae607dc065c82b6d454f64e90584 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 21:52:33 +0800
Subject: [PATCH] 预警分析管理-电源告警

---
 src/main/java/com/whyc/util/ActionUtil.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/util/ActionUtil.java b/src/main/java/com/whyc/util/ActionUtil.java
index a961055..13cab65 100644
--- a/src/main/java/com/whyc/util/ActionUtil.java
+++ b/src/main/java/com/whyc/util/ActionUtil.java
@@ -29,6 +29,7 @@
 	public static String time_yyyyMMddHHmmss = "yyyy-MM-dd HH:mm:ss";
 	public static String time_yyyyMMdd = "yyyy-MM-dd";
 	public static String time_yyyyMM = "yyyy-MM";
+	public static String time_yyyy_MM = "yyyy_MM";
 	public static String time_yyyyMMdd_HH_mm_ss = "yyyy-MM-dd_HH_mm_ss";
 	public static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	public static SimpleDateFormat sdfwithOutday = new SimpleDateFormat("yyyy_MM");
@@ -647,7 +648,7 @@
 
 		List<String> dateList = new ArrayList<>();
 		LocalDate currentDate = startDate;
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern(ActionUtil.time_yyyyMM);
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern(ActionUtil.time_yyyy_MM);
 		while (!currentDate.isAfter(endDate)) {
 			String formattedDate = currentDate.format(formatter);
 			dateList.add(formattedDate);
@@ -655,11 +656,29 @@
 		}
 		return dateList;
 	}
+	// 鍖归厤 "_" 鍚庤窡涓�涓瓧姣嶏紙灏忓啓鎴栧ぇ鍐欙級
+	public static String toCamelCase(String input) {
+		// 鍖归厤 "_" 鍚庤窡涓�涓瓧姣嶏紙灏忓啓鎴栧ぇ鍐欙級
+		Pattern pattern = Pattern.compile("_(\\w)");
+		Matcher matcher = pattern.matcher(input);
+		StringBuffer result = new StringBuffer();
+
+		while (matcher.find()) {
+			// 灏嗗尮閰嶅埌鐨勫瓧姣嶈浆涓哄ぇ鍐欙紝骞舵浛鎹㈡帀鍓嶉潰鐨勪笅鍒掔嚎
+			matcher.appendReplacement(result, matcher.group(1).toUpperCase());
+		}
+		matcher.appendTail(result);
+
+		return result.toString();
+	}
 
 	public static void main(String[] args) throws ParseException {
-		List<String> dateList =getDateListBetweenDates(ActionUtil.sdf.parse("2025-01-01 00:00:00"),new Date());
+		/*List<String> dateList =getDateListBetweenDates(ActionUtil.sdf.parse("2025-01-01 00:00:00"),new Date());
 		for (String date : dateList) {
 			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));
 	}
 }	

--
Gitblit v1.9.1