From f998f917f90d86499bf8a24c8912e270655e4d43 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 24 六月 2025 17:27:57 +0800
Subject: [PATCH] 预警分析修改

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

diff --git a/src/main/java/com/whyc/util/ActionUtil.java b/src/main/java/com/whyc/util/ActionUtil.java
index 3b2bd86..fd4edb8 100644
--- a/src/main/java/com/whyc/util/ActionUtil.java
+++ b/src/main/java/com/whyc/util/ActionUtil.java
@@ -18,6 +18,8 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -27,6 +29,8 @@
 
 	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");
@@ -337,7 +341,6 @@
         cal.set(Calendar.DAY_OF_MONTH,day);  
         if(type==1){
         	return   new   SimpleDateFormat( "yyyy-MM-dd ").format(cal.getTime())+"00:00:00";  
-			 
         } else if(type==2){
         	return   new   SimpleDateFormat( "yyyy-MM-dd ").format(cal.getTime())+"09:00:00";  
         }else if(type==3){
@@ -637,5 +640,45 @@
 		}
 		return lang;
 	}
+     //涓ゆ椂闂翠箣闂寸殑骞存湀闆嗗悎
+	public static List<String> getDateListBetweenDates(Date startTime, Date endTime) {
+		// 鎸囧畾寮�濮嬫棩鏈熷拰缁撴潫鏃ユ湡
+		LocalDate startDate = LocalDate.of(startTime.getYear() + 1900, startTime.getMonth() + 1, startTime.getDay()); // 绀轰緥璧峰鏃ユ湡
+		LocalDate endDate = LocalDate.of(endTime.getYear() + 1900, endTime.getMonth() + 1, endTime.getDay());  // 绀轰緥缁撴潫鏃ユ湡
 
+		List<String> dateList = new ArrayList<>();
+		LocalDate currentDate = startDate;
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern(ActionUtil.time_yyyy_MM);
+		while (!currentDate.isAfter(endDate)) {
+			String formattedDate = currentDate.format(formatter);
+			dateList.add(formattedDate);
+			currentDate = currentDate.plusMonths(1);
+		}
+		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());
+		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