From 2f55cebbad3dea187a5f91d16ec80a9677dab699 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 十一月 2024 11:16:53 +0800
Subject: [PATCH] 1

---
 src/main/java/com/yssh/utils/DateUtils.java |   97 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/yssh/utils/DateUtils.java b/src/main/java/com/yssh/utils/DateUtils.java
index cb84b7b..838ce2b 100644
--- a/src/main/java/com/yssh/utils/DateUtils.java
+++ b/src/main/java/com/yssh/utils/DateUtils.java
@@ -7,11 +7,6 @@
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
-/**
- * 鏃堕棿宸ュ叿绫�
- * 
- * @author tam
- */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	public static String YYYY = "yyyy";
 
@@ -37,20 +32,10 @@
 			"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss",
 			"yyyy.MM.dd HH:mm", "yyyy.MM"};
 
-	/**
-	 * 鑾峰彇褰撳墠Date鍨嬫棩鏈�
-	 *
-	 * @return Date() 褰撳墠鏃ユ湡
-	 */
 	public static Date getNowDate() {
 		return new Date();
 	}
 
-	/**
-	 * 鑾峰彇褰撳墠鏃ユ湡, 榛樿鏍煎紡涓簓yyy-MM-dd
-	 *
-	 * @return String
-	 */
 	public static String getDate() {
 		return dateTimeNow(YYYY_MM_DD);
 	}
@@ -212,9 +197,6 @@
 		return times;
 	}
 
-	/**
-	 *
-	 */
 	public static Map<Date, Date> segmentationDateByTimeQuantum(Date startDate, Date endDate, int timeQuantum, int dateType) {
 		LinkedHashMap<Date, Date> result = new LinkedHashMap<Date, Date>();
 		long startTimeMillisecond = startDate.getTime();
@@ -245,32 +227,79 @@
 	}
 
 	/**
-	 * 鑾峰彇鏈湀绗竴澶�
-	 *
-	 * @return String
-	 **/
-	public static Date getMonthStart() {
+	 * 鍓櫎鏃ユ湡鐨勬椂闂撮儴鍒�
+	 */
+	public static Date trimTime(Date date) {
 		Calendar cal = Calendar.getInstance();
-		//cal.set(Calendar.MONTH, 3);
+		cal.setTime(date);
+
+		return dateTime(YYYY_MM_DD_HH_MM_SS, parseDateToStr(YYYY_MM_DD, cal.getTime()) + " 00:00:00");
+	}
+
+	/**
+	 * 鍘诲勾
+	 */
+	public static Date lastYear(Date date) {
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(date);
+		cal.add(Calendar.YEAR, -1);
+
+		return cal.getTime();
+	}
+
+	/**
+	 * 鑾峰彇涓�骞翠腑鐨勭鍑犲懆
+	 */
+	public static int getWeekOfYear(Date date) {
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(date);
+
+		return cal.get(Calendar.WEEK_OF_YEAR);
+	}
+
+	/**
+	 * 鑾峰彇涓�骞翠腑鐨勭鍑犲懆鐨勬槦鏈熶竴
+	 */
+	public static Date getWeekOfYearForMon(int year, int weekOfYear) {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.YEAR, year);
+		cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+		cal.set(Calendar.WEEK_OF_YEAR, weekOfYear);
+
+		return cal.getTime();
+	}
+
+	/**
+	 * 鑾峰彇涓�骞翠腑鐨勭鍑犲懆鐨勬槦鏈熸棩
+	 */
+	public static Date getWeekOfYearForSun(int year, int weekOfYear) {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.YEAR, year);
+		cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+		cal.set(Calendar.WEEK_OF_YEAR, weekOfYear);
+
+		return cal.getTime();
+	}
+
+	/**
+	 * 鑾峰彇鏈湀绗竴澶�
+	 **/
+	public static Date getMonthStart(Date date) {
+		Calendar cal = Calendar.getInstance();
+		// cal.set(Calendar.MONTH, 3)
+		cal.setTime(date);
 		cal.set(Calendar.DAY_OF_MONTH, 1);
 		return dateTime(YYYY_MM_DD_HH_MM_SS, parseDateToStr(YYYY_MM_DD, cal.getTime()) + " 00:00:00");
 	}
 
 	/**
 	 * 鑾峰彇鏈湀鏈�鍚庝竴澶�
-	 *
-	 * @return String
 	 **/
-	public static Date getMonthEnd() {
+	public static Date getMonthEnd(Date date) {
 		Calendar cal = Calendar.getInstance();
-		//cal.set(Calendar.MONTH, 3);
+		// cal.set(Calendar.MONTH, 3)
+		cal.setTime(date);
 		cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
 		return dateTime(YYYY_MM_DD_HH_MM_SS, parseDateToStr(YYYY_MM_DD, cal.getTime()) + " 23:59:59");
-	}
-
-	public static void main(String[] args) {
-		//System.out.println(parseDateToStr(YYYY_MM_DD_HH_MM_SS, getMonthStart()));
-		//System.err.println(parseDateToStr(YYYY_MM_DD_HH_MM_SS, getMonthEnd()));
-		System.out.println(parseDateToStr(YYYY_MM_DD_HH_MM_SS, getAPeriodOfTime(getNowDate(), -7, Calendar.DATE)));
 	}
 }

--
Gitblit v1.9.3