From 88c60e6e4e03eb59bde5f83a944c818dfecb3975 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 05 十一月 2025 10:56:10 +0800
Subject: [PATCH] 最新版本541200007

---
 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index 3729091..6213c15 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -16,7 +16,6 @@
 import cn.hutool.core.date.DateUnit;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
-
 /**
  * 鏃ユ湡宸ュ叿绫�
  * @author: jiangping
@@ -178,6 +177,26 @@
             m_intervalday = m_intervalday / 1000 / 60 / 60;// 璁$畻鎵�寰楃殑澶╂暟
 
             return m_intervalday + 1;
+        } catch (Exception e) {
+            return Integer.MIN_VALUE;
+        }
+    }
+
+
+    /**
+     * 鑾峰彇2涓椂闂翠箣闂寸殑鍒嗛挓鏁�
+     * @param fromDate
+     * @param toDate
+     * @return
+     */
+    public static long getBetweenMin(Date fromDate, Date toDate) {
+        long m_intervalday = 0;// 鍒濆鍖栨椂闂撮棿闅旂殑鍊间负0
+        // 浣跨敤鐨勬椂闂存牸寮忎负yyyy-MM-dd
+        try {
+            m_intervalday = toDate.getTime() - fromDate.getTime();// 璁$畻鎵�寰椾负寰鏁�
+            m_intervalday = m_intervalday / 1000 / 60;// 璁$畻鎵�寰楃殑鍒嗛挓
+
+            return m_intervalday;
         } catch (Exception e) {
             return Integer.MIN_VALUE;
         }
@@ -2952,7 +2971,7 @@
 //            Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
 //            System.out.println(DateUtil.afterMinutesDate(-5));
 
-            System.out.println(DateUtil.getFirstThisMonthDate());
+            System.out.println(DateUtil.getWeekZhouOfDate(getDateFromString2("2025-11-06 00:00:00")));
 
 //            System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
 //            System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
@@ -3094,7 +3113,6 @@
         String temp = sdf.format(date);
         String firstDayInMoth = "";
         firstDayInMoth = temp + "-01";
-
         return firstDayInMoth;
 
     }
@@ -3120,6 +3138,26 @@
     }
 
     /**
+     * 鑾峰彇褰撳墠鏃ユ湡鏄槦鏈熷嚑<br>
+     *
+     * @param dt
+     * @return 褰撳墠鏃ユ湡鏄槦鏈熷嚑
+     */
+    public static String getWeekZhouOfDate(Date dt) {
+        String[] weekDays = { "鍛ㄦ棩", "鍛ㄤ竴", "鍛ㄤ簩", "鍛ㄤ笁", "鍛ㄥ洓", "鍛ㄤ簲", "鍛ㄥ叚" };
+        TimeZone china = TimeZone.getTimeZone("Asia/Shanghai");
+        Calendar cal = Calendar.getInstance(china);
+        cal.setTime(dt);
+
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        if (w < 0)
+        {
+            w = 0;
+        }
+
+        return weekDays[w];
+    }
+    /**
      * 鑾峰彇鏄熸湡鏁�
      *
      * @param dt

--
Gitblit v1.9.3