From 7aac89af7c8b8a633cb0a0c870e81724b0ec5def Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 03 二月 2023 10:54:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/hx/util/DateUtil.java | 96 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 81 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index befbd61..ddefebf 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -455,7 +455,7 @@
* endTime姣攕tartTime澶氱殑澶╂暟
* @param startTime 鏈�灏忔椂闂�
* @param endTime 鏈�澶ф椂闂�
- * @return
+ * @return 杩斿洖
*/
public static Integer differDay(Date startTime,Date endTime){
Calendar cal1 = Calendar.getInstance();
@@ -500,8 +500,7 @@
}
/**鎶婄杞崲鎴怷澶鏃禭鍒哫绉�*/
- public static String getChineseStr(Integer second)
- {
+ public static String getChineseStr(Integer second) {
int day = 24 * 60 * 60;
int hour = 60 * 60;
int min = 60;
@@ -572,8 +571,7 @@
/**
* 鑾峰彇褰撳墠鏈堢殑缁撴潫鏃堕棿
- *
- * @param date 0鎷垮彇褰撴湀锛屾浠ｈ〃鍚庯紝璐熶唬琛ㄥ墠锛屽�间负鍑犱釜锛堟湀锛�
+ * @param date 鐐瑰墠鏃堕棿
* @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
*/
public static Date getMonthEnd(Date date) {
@@ -588,7 +586,6 @@
/**
* 鑾峰彇褰撳墠鏈堢殑缁撴潫鏃堕棿
- *
* @param num 0鎷垮彇褰撴湀锛屾浠ｈ〃鍚庯紝璐熶唬琛ㄥ墠锛屽�间负鍑犱釜锛堟湀锛�
* @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
*/
@@ -611,7 +608,7 @@
public static Date getYearStart(Date time) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
- calendar.set(Calendar.MONTH, 1);
+ calendar.set(Calendar.MONTH, 0);
calendar.set(Calendar.DAY_OF_MONTH, 1);
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
@@ -619,40 +616,68 @@
return calendar.getTime();
}
-
/**
+ * 鑾峰彇褰撳墠骞寸殑缁撴潫鏃堕棿
+ * @param time 鏃堕棿
+ * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 00:00:00
+ */
+ public static Date getYearEnd(Date time) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(time);
+ calendar.set(Calendar.MONTH, 11);
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DATE));
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
+ calendar.set(Calendar.MINUTE, 59);
+ calendar.set(Calendar.SECOND, 59);
+ return calendar.getTime();
+ }
+
+
+ /**杩欏ぉ鐨勫紑濮嬫椂闂�
* 鏃ユ湡2000-01-01鍙�2000-01-01 00:00:00
*/
public static String dayToStart(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
- calendar.set(Calendar.HOUR, 0);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
return sdf.format(calendar.getTime());
}
- /**
+ /**杩欏ぉ鐨勬渶鍚庢椂闂�
* 鏃ユ湡2000-01-01鍙�2000-01-01 23:59:59
*/
public static String dayToEnd(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
- calendar.set(Calendar.HOUR, 23);
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
calendar.set(Calendar.MINUTE, 59);
calendar.set(Calendar.SECOND, 59);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
return sdf.format(calendar.getTime());
}
- /**
+ /**杩欏ぉ鐨勫紑濮嬫椂闂�
+ * 鏃ユ湡2000-01-01鍙�2000-01-01 00:00:00
+ */
+ public static Date dayToStartDate(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ return calendar.getTime();
+ }
+
+ /**杩欏ぉ鐨勬渶鍚庢椂闂�
* 鏃ユ湡2000-01-01鍙�2000-01-01 23:59:59
*/
public static Date dayToEndDate(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
- calendar.set(Calendar.HOUR, 23);
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
calendar.set(Calendar.MINUTE, 59);
calendar.set(Calendar.SECOND, 59);
return calendar.getTime();
@@ -669,6 +694,7 @@
cal.roll(Calendar.DATE, -1);
return cal.getActualMaximum(Calendar.DATE);
}
+
/**鑾峰彇鏈堜唤鐨勫ぉ鏁�
* @param year 骞翠唤
* @param month 鏈堜唤
@@ -686,7 +712,7 @@
/**鑾峰彇鏈堜唤鐨勫ぉ鏁�
* @param yearMonth 骞存湀
* @param format 鏃堕棿鏍煎紡
- * @return
+ * @return 杩斿洖
*/
public static int getMonthDays(String yearMonth,String format) {
SimpleDateFormat sdf = new SimpleDateFormat(format);
@@ -708,10 +734,50 @@
public static boolean getFrontMinute(Date date,int num) {
Calendar cal = Calendar.getInstance();
cal.setTime(date);
- cal.set(Calendar.HOUR, num-1);
+ cal.set(Calendar.HOUR_OF_DAY, num-1);
cal.set(Calendar.MINUTE, 59);
cal.set(Calendar.SECOND, 59);
return date.compareTo(cal.getTime()) < 1;
}
+
+ /**
+ * 鑾峰緱鏌愪釜鏃ユ湡鐨勫綋澶╂煇鐐�
+ * 渚嬪:2022-12-26 11:20:00 -> 2022-12-26 13:00:00
+ * @param num 24灏忔椂
+ */
+ public static String getHourDayTime(Date date,int num) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.set(Calendar.HOUR_OF_DAY, num);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+ return sdf.format(calendar.getTime());
+ }
+
+ /**
+ * 鑾峰彇鏃堕棿褰撴湀鍓╀綑澶╂暟
+ * */
+ public static Integer getMonthSurplus(Date date) {
+ Calendar month = Calendar.getInstance();
+ month.setTime(new Date());
+ month.set(Calendar.DATE, 1);
+ month.roll(Calendar.DATE, -1);
+ return month.getActualMaximum(Calendar.DATE) - Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
+ }
+
+ /**鑾峰彇褰撳墠鏃堕棿鎵�鍦ㄥ懆鐨勫懆涓�00:00:00*/
+ public static Date getMonday(Date date) {
+ Calendar calendar = Calendar.getInstance(Locale.CHINA);
+ calendar.setTime(date);
+ //浠ュ懆涓�涓洪鏃�
+ calendar.setFirstDayOfWeek(Calendar.MONDAY);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ //鍛ㄤ竴
+ calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+ return calendar.getTime();
+ }
}
--
Gitblit v1.8.0