From 6946ac243a04efb1c0f969c284f983fddb417319 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 03 二月 2023 11:24:33 +0800
Subject: [PATCH] 修改文件转换方法

---
 src/main/java/com/hx/util/DateUtil.java |  223 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 207 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index 07f240a..ddefebf 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -440,10 +440,22 @@
     }
 
     /**
+     * 鑾峰彇涓や釜鏃堕棿鐩稿樊鍒嗛挓鏁�
+     * @param startTime 寮�濮嬫椂闂�
+     * @param endTime 缁撴潫鏃堕棿
+     * @return 鍒嗛挓
+     */
+    public static long differMinute(Date startTime, Date endTime) {
+        long NTime = startTime.getTime();
+        long OTime = endTime.getTime();
+        return (NTime - OTime) / 1000 / 60;
+    }
+
+    /**
      * endTime姣攕tartTime澶氱殑澶╂暟
      * @param startTime 鏈�灏忔椂闂�
      * @param endTime 鏈�澶ф椂闂�
-     * @return
+     * @return 杩斿洖
      */
     public static Integer differDay(Date startTime,Date endTime){
         Calendar cal1 = Calendar.getInstance();
@@ -488,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;
@@ -524,8 +535,21 @@
         }
 
         return 0;
+    }
 
-
+    /**
+     * 鑾峰彇褰撳墠鏈堢殑寮�濮嬫椂闂�
+     * @param time 鏃堕棿
+     * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 00:00:00
+     */
+    public static Date getMonthStart(Date time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(time);
+        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();
     }
 
     /**
@@ -547,7 +571,21 @@
 
     /**
      * 鑾峰彇褰撳墠鏈堢殑缁撴潫鏃堕棿
-     *
+     * @param date 鐐瑰墠鏃堕棿
+     * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
+     */
+    public static Date getMonthEnd(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        return calendar.getTime();
+    }
+
+    /**
+     * 鑾峰彇褰撳墠鏈堢殑缁撴潫鏃堕棿
      * @param num 0鎷垮彇褰撴湀锛屾浠h〃鍚庯紝璐熶唬琛ㄥ墠锛屽�间负鍑犱釜锛堟湀锛�
      * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
      */
@@ -562,14 +600,156 @@
         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, 0);
+        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, 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_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_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        return calendar.getTime();
+    }
+
+    /**鑾峰彇鏈堜唤鐨勫ぉ鏁�
+     * @param date 鏃堕棿
+     * @return 鏈堜唤鐨勫ぉ鏁�
+     */
+    public static int getMonthDays(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.DATE, 1);
+        cal.roll(Calendar.DATE, -1);
+        return cal.getActualMaximum(Calendar.DATE);
+    }
+    
+    /**鑾峰彇鏈堜唤鐨勫ぉ鏁�
+     * @param year 骞翠唤
+     * @param month 鏈堜唤
+     * @return 鏈堜唤鐨勫ぉ鏁�
+     */
+    public static int getMonthDays(int year, int month) {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, year);
+        cal.set(Calendar.MONTH, (month - 1));
+        cal.set(Calendar.DATE, 1);
+        cal.roll(Calendar.DATE, -1);
+        return cal.getActualMaximum(Calendar.DATE);
+    }
+
+    /**鑾峰彇鏈堜唤鐨勫ぉ鏁�
+     * @param yearMonth 骞存湀
+     * @param format 鏃堕棿鏍煎紡
+     * @return 杩斿洖
+     */
+    public static int getMonthDays(String yearMonth,String format) {
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        Calendar calendar = Calendar.getInstance();
+        try {
+            calendar.setTime(sdf.parse(yearMonth));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        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;
+    }
+
+    /**
+     * 鑾峰緱鏌愪釜鏃ユ湡鐨勫綋澶╂煇鐐�
+     * 渚嬪: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);
@@ -577,16 +757,27 @@
     }
 
     /**
-     * 鏃ユ湡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.MINUTE, 59);
-        calendar.set(Calendar.SECOND, 59);
-        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