From 4ddff036191a2ec6ee6f85a337c97d6f7d9471d6 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 14 五月 2025 18:21:14 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/core/utils/DateUtil.java |   96 +++++++++++++++++-------------------------------
 1 files changed, 34 insertions(+), 62 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 893375e..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
@@ -3029,6 +3036,10 @@
         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) {
         String dateString = null;
         if (dateStyle != null) {
@@ -3145,69 +3156,30 @@
     }
 
 
-    public static void main(String[] args) {
-//       System.out.println(DateUtil.DateToStr(DateUtil.afterDateByType(
-//               DateUtil.stringToDate("2024-02-01","yyyy-MM-dd")
-//               ,1,1),"yyyy-MM-dd HH:mm:ss"));
-
-//        System.out.println( DateUtil.daysBetweenDates(DateUtil.stringToDate("2024-02-29","yyyy-MM-dd"),
-//                DateUtil.stringToDate("2024-02-01","yyyy-MM-dd"))
-//        );
-//
-//        System.out.println(DateUtil.calculateBetween(DateUtil.StringToDate("2024-02-29 23:59:59"),DateUtil.StringToDate("2024-02-01 00:00:00"),0));
-
-
-//        System.out.println(
-//                DateUtil.DateToStr(
-//
-//                DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),1) ,"yyyy-MM-dd HH:mm:ss"
-//                )
-//        );
-//
-//
-//
-//        System.out.println(
-//
-//                DateUtil.DateToStr(
-//
-//                        DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),2) ,"yyyy-MM-dd HH:mm:ss"
-//                )
-//
-//        );
-//
-//        System.out.println(
-//
-//                DateUtil.DateToStr(
-//
-//                        DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),3) ,"yyyy-MM-dd HH:mm:ss"
-//                )
-
-//        );
-//
-//        Calendar calo = Calendar.getInstance();
-//        Calendar caln = Calendar.getInstance(); // ,"yyyy-MM-dd HH:mm:ss"
-//        caln.setTime(DateUtil.StringToDate("2024-02-29 23:59:59"));
-//        calo.setTime(DateUtil.StringToDate("2024-02-01 00:00:00"));
-//        System.out.println( DateUtil.calculateDaysBetweenDates(calo,caln));
-
-        System.out.println(
-                DateUtil.DateToStr(
-                        DateUtil.getNextMonthFirst(new Date())
-                        ,"yyyy-MM-dd HH:mm:ss")
-
-        );
-        System.out.println(
-                DateUtil.DateToStr(
-                        DateUtil.getNextMonthFirst(
-                                DateUtil.StringToDate("2024-12-29 21:59:59")
-                        )
-                        ,"yyyy-MM-dd HH:mm:ss")
-
-        );
-
-
-
+    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