From 05b1758ef5f78b1496e77dd00969f3af754afd46 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 17 十二月 2022 15:01:56 +0800
Subject: [PATCH] 修改时间工具类

---
 src/main/java/com/hx/util/DateUtil.java |   69 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index 617b78b..d1e6aab 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -572,8 +572,7 @@
 
     /**
      * 鑾峰彇褰撳墠鏈堢殑缁撴潫鏃堕棿
-     *
-     * @param date 0鎷垮彇褰撴湀锛屾浠h〃鍚庯紝璐熶唬琛ㄥ墠锛屽�间负鍑犱釜锛堟湀锛�
+     * @param date 鐐瑰墠鏃堕棿
      * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
      */
     public static Date getMonthEnd(Date date) {
@@ -588,7 +587,6 @@
 
     /**
      * 鑾峰彇褰撳墠鏈堢殑缁撴潫鏃堕棿
-     *
      * @param num 0鎷垮彇褰撴湀锛屾浠h〃鍚庯紝璐熶唬琛ㄥ墠锛屽�间负鍑犱釜锛堟湀锛�
      * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
      */
@@ -603,31 +601,75 @@
         return sdf.format(calendar.getTime());
     }
 
+    /**
+     * 鑾峰彇褰撳墠骞寸殑寮�濮嬫椂闂�
+     * @param time 鏃堕棿
+     * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 00:00:00
+     */
+    public static Date getYearStart(Date time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(time);
+        calendar.set(Calendar.MONTH, 1);
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        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, 12);
+        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 23:59:59
+     */
+    public static Date dayToEndDate(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        return calendar.getTime();
     }
 
     /**鑾峰彇鏈堜唤鐨勫ぉ鏁�
@@ -671,4 +713,19 @@
         calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
         return calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
     }
+
+    /**褰撳ぉ澶氬皯鐐瑰墠
+     * @param date 鏃堕棿
+     * @param num 澶氬皯鐐瑰墠锛屼笉鍚綋鐐瑰墠锛�24灏忔椂鍒�
+     * @return 鏈堜唤鐨勫ぉ鏁�
+     */
+    public static boolean getFrontMinute(Date date,int num) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.HOUR_OF_DAY, num-1);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.SECOND, 59);
+
+        return date.compareTo(cal.getTime()) < 1;
+    }
 }

--
Gitblit v1.8.0