From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/core/utils/DateUtil.java |  193 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 185 insertions(+), 8 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
index 7942d79..fa297b0 100644
--- a/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -1,11 +1,16 @@
 package com.doumee.core.utils;
 
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.DateFormatSymbols;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Enumeration;
@@ -348,6 +353,8 @@
             throw e;
         }
     }
+
+
 
     /**
      * Descrption:鍙栧緱褰撳墠鏃ユ湡,鏍煎紡涓�:yyyy-MM-dd HH:mm:ss
@@ -1291,6 +1298,59 @@
 
         return days;
     }
+
+    public static int calculateBetween(Date newDate, Date oldDate,Integer type){
+        Calendar calo = Calendar.getInstance();
+        Calendar caln = Calendar.getInstance();
+        calo.setTime(oldDate);
+        caln.setTime(newDate);
+        if(type==0||type==1){
+            return    calculateDaysBetweenDates(caln, calo)  + 1 ;
+        }else if(type==2){
+
+            int day = caln.get(Calendar.DATE);
+            if(day == 1){
+                return    calculateMonthsBetweenDates(caln, calo) + 1;
+            }else{
+                return    calculateMonthsBetweenDates(caln, calo);
+            }
+
+        }else if(type==3){
+            return    calculateYearsBetweenDates(caln, calo) + 1;
+        }
+        return -1;
+    }
+
+
+
+    public static int calculateDaysBetweenDates(Calendar startDate, Calendar endDate) {
+        long timeDiffInMillis = Math.abs(endDate.getTimeInMillis() - startDate.getTimeInMillis());
+        return (int)(timeDiffInMillis / (24 * 60 * 60 * 1000));
+    }
+
+    public static int calculateMonthsBetweenDates(Calendar startDate, Calendar endDate) {
+        int yearDiff = endDate.get(Calendar.YEAR) - startDate.get(Calendar.YEAR);
+        int monthDiff = endDate.get(Calendar.MONTH) - startDate.get(Calendar.MONTH);
+        if (monthDiff < 0 || (monthDiff == 0 && endDate.get(Calendar.DAY_OF_MONTH) < startDate.get(Calendar.DAY_OF_MONTH))) {
+            yearDiff--;
+            monthDiff += 12;
+        }
+        return yearDiff * 12 + monthDiff;
+    }
+
+    public static int calculateYearsBetweenDates(Calendar startDate, Calendar endDate) {
+        int yearDiff = endDate.get(Calendar.YEAR) - startDate.get(Calendar.YEAR);
+        if (yearDiff > 0 && (startDate.get(Calendar.MONTH) >= endDate.get(Calendar.MONTH) ||
+                (startDate.get(Calendar.MONTH) == endDate.get(Calendar.MONTH) && startDate.get(Calendar.DAY_OF_MONTH) <= endDate.get(Calendar.DAY_OF_MONTH)))) {
+            yearDiff--;
+        } else if (yearDiff < 0 && (startDate.get(Calendar.MONTH) <= endDate.get(Calendar.MONTH) ||
+                (startDate.get(Calendar.MONTH) == endDate.get(Calendar.MONTH) && startDate.get(Calendar.DAY_OF_MONTH) >= endDate.get(Calendar.DAY_OF_MONTH)))) {
+            yearDiff++;
+        }
+        return yearDiff;
+    }
+
+
 
     /**
      * 鍙栧緱涓庡師鏃ユ湡鐩稿樊涓�瀹氬ぉ鏁扮殑鏃ユ湡锛岃繑鍥濪ate鍨嬫棩鏈�
@@ -2748,13 +2808,6 @@
         return sdfLongTimePlus.parse(sdfLongTimePlus.format(date));
     }
 
-    public static void main(String[] args) {
-        try {
-            System.out.println(RandomStringUtils.randomNumeric(3));
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
 
     /**
      *
@@ -2859,6 +2912,7 @@
         return nowDateString;
     }
 
+
     /**
      * @ author zhangyong @ 鑾峰彇褰撴湀鐨勭涓�澶╋紝2009-05-01
      */
@@ -2910,9 +2964,14 @@
         return w;
     }
 
-    public static Long twoDaysBetween(Date beginDate, Date endDate) throws ParseException {
+    public static Long twoDaysBetween(Date beginDate, Date endDate) {
         long minute = (endDate.getTime() - beginDate.getTime()) / (60 * 1000);
         return minute;
+    }
+
+    public static Integer daysBetweenDay(Date beginDate, Date endDate) {
+        long day = (endDate.getTime() - beginDate.getTime()) / (60 * 1000 * 60 * 24);
+        return Math.toIntExact(day);
     }
 
     /**
@@ -2943,6 +3002,21 @@
         return calendar.getTime();
     }
 
+    /**
+     * 鑾峰彇鎸囧畾鏃ユ湡鐨勪笅涓湀绗竴澶�
+     * @param date
+     * @return
+     */
+    public static Date getNextMonthFirst(Date date){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.MONTH, 1); // 灏嗘棩鍘嗙殑鏈堜唤澧炲姞1
+        calendar.set(Calendar.DAY_OF_MONTH, 1); // 璁剧疆涓轰笅涓湀鐨勭涓�澶�
+        return calendar.getTime();
+    }
+
+
+
 
     public static String afterDateToStr(Integer days){
         Date date = new Date();
@@ -2960,6 +3034,10 @@
 
     public static String getLongDate(Date date) {
         return DateToString(date, "yyyyMMddHHmmss");
+    }
+
+    public static String getLongDateTime(Date date) {
+        return DateToString(date, "yyyy-MM-dd HH:mm:ss");
     }
 
     public static String DateToString(Date date, String dateStyle) {
@@ -3005,4 +3083,103 @@
         cal.add(Calendar.MINUTE,minutes);
         return cal.getTime();
     }
+
+
+    /**
+     * 璁$畻澶氬皯鑷劧骞�/鏈�/鏃ュ悗鐨勬棩鏈�
+     * @param startDate 寮�濮嬫棩鏈�
+     * @param type  0=鏃ワ紱1=鏈堬紱2=骞达紱
+     * @param cycle 鍛ㄦ湡  X鏈�
+     * @return
+     */
+    public static Date afterDateByType(Date startDate,Integer type,Integer cycle){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(startDate);
+        if(type==0){
+            calendar.add(Calendar.DATE, cycle);
+        }else if(type==1){
+            calendar.add(Calendar.MONTH, cycle);
+        }else if(type == 2) {
+            calendar.add(Calendar.YEAR, cycle);
+        }
+        return calendar.getTime();
+    }
+
+
+
+    public static Integer monthDays(Date date){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        // 鑾峰彇褰撳墠骞翠唤銆佹湀浠斤紙娉ㄦ剰鏈堜唤浠�0寮�濮嬭绠楋級
+        int year = calendar.get(Calendar.YEAR);
+        int month = calendar.get(Calendar.MONTH) + 1;
+        // 鏍规嵁骞翠唤鍜屾湀浠藉垽鏂棸骞存儏鍐�
+        boolean isLeapYear = (year % 4 == 0 && year % 100 != 0) || (year % 400 == 0);
+
+        // 鏍规嵁涓嶅悓鏈堜唤璁惧畾姣忎釜鏈堢殑澶╂暟
+        switch (month) {
+            case 2:
+                if (isLeapYear) {
+                    return 29;
+                } else {
+                    return 28;
+                }
+            case 4:
+            case 6:
+            case 9:
+            case 11:
+                 return 30;
+            default:
+                 return 31;
+        }
+    }
+
+
+    /**
+     * 鎷兼帴鏃ユ湡鏁版嵁
+     * @param date
+     * @param optType   1:姣忔棩寮�濮� 2锛氭瘡鏃ョ粨鏉� 3:鏄ㄦ棩缁撴潫
+     * @return
+     */
+    public static Date getMontageDate(Date date ,Integer optType) {
+        String strShortDate = DateUtil.dateToString(date,"yyyy-MM-dd");
+        if(optType.equals(1)){
+            return DateUtil.StringToDate(strShortDate +" 00:00:00");
+        }else if(optType.equals(2)){
+            return DateUtil.StringToDate(strShortDate +" 23:59:59");
+        }else if(optType.equals(3)){
+            strShortDate = DateUtil.dateToString(DateUtil.getDateBetween(date,-1),"yyyy-MM-dd");
+            return DateUtil.StringToDate(strShortDate +" 23:59:59");
+        }else{
+            return null;
+        }
+    }
+
+
+    public static void main(String[] args) throws Exception{
+        System.out.println(DateUtil.getLongDateTime(new Date()));;
+    }
+
+    /**
+     * 鑾峰彇鐩稿樊鐨勬湀鏁�
+     * @param sDate
+     * @param eDate
+     * @return
+     */
+    public static Integer getDifferenceMonths(Date sDate ,Date eDate) {
+        LocalDate startDate = sDate.toInstant()
+                .atZone(ZoneId.systemDefault())
+                .toLocalDate();
+        LocalDate endDate = eDate.toInstant()
+                .atZone(ZoneId.systemDefault())
+                .toLocalDate();
+//        LocalDate startDate= LocalDate.of(2021,2,28);
+//        LocalDate endDate =LocalDate.of(2022,4,5);
+        Period period = Period.between(endDate,startDate);
+        int months = period.getYears()* 12 + period.getMonths();
+        return months + 1;
+    }
+
+
+
 }
\ No newline at end of file

--
Gitblit v1.9.3