From cc3c6537dcd5bc7b8eb98046dfcaf0ad93484d60 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 20 十一月 2025 16:12:20 +0800
Subject: [PATCH] 钥匙柜大屏

---
 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 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 bd7699c..73c174b 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
@@ -403,6 +403,25 @@
         }
         return list;
     }
+
+
+    public static List<String> getBeforDaysByFormat(Date currentDate,Integer days,String format){
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(currentDate);
+        Date endDate = currentDate; // 鑾峰彇褰撳墠鏃ユ湡
+        calendar.add(Calendar.DAY_OF_YEAR, -days); // 寰�鍓嶆帹7澶�
+        Date startDate = calendar.getTime(); // 鑾峰彇鎺ㄧ畻鍚庣殑鏃ユ湡
+        List<String> list = new ArrayList<>();
+        while (startDate.before(endDate)) {
+            calendar.add(Calendar.DAY_OF_YEAR, 1); // 鑾峰彇涓嬩竴澶╂棩鏈�
+            startDate = calendar.getTime();
+            list.add(DateUtil.dateToString(startDate,format));
+            System.out.println(DateUtil.dateToString(startDate,format));
+        }
+        return list;
+    }
+
     public static List<Date> getDateListBeforDays(Date currentDate,Integer days){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Calendar calendar = Calendar.getInstance();
@@ -2085,7 +2104,7 @@
      */
     public static String getCurrDateTime() {
         Timestamp date = new Timestamp(System.currentTimeMillis());
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return formatter.format(date);
     }
 
@@ -2971,7 +2990,7 @@
 //            Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
 //            System.out.println(DateUtil.afterMinutesDate(-5));
 
-            System.out.println(DateUtil.getWeekZhouOfDate(getDateFromString2("2025-11-06 00:00:00")));
+            System.out.println(DateUtil.getISO8601DateByStr("2025-11-12T09:13:00.000Z"));
 
 //            System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
 //            System.out.println(DateUtil.getBeforMonthStr(new Date(),12));

--
Gitblit v1.9.3