From 44ff584e5dcb3a066d70e4eaaf9f098440a1a5f7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 20 十一月 2025 12:07:43 +0800
Subject: [PATCH] 钥匙柜大屏
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 d989500..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
@@ -16,7 +16,6 @@
import cn.hutool.core.date.DateUnit;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
-
/**
* 鏃ユ湡宸ュ叿绫�
* @author: jiangping
@@ -404,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();
@@ -2086,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);
}
@@ -2972,7 +2990,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.getISO8601DateByStr("2025-11-12T09:13:00.000Z"));
// System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
// System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
@@ -3114,7 +3132,6 @@
String temp = sdf.format(date);
String firstDayInMoth = "";
firstDayInMoth = temp + "-01";
-
return firstDayInMoth;
}
@@ -3147,7 +3164,8 @@
*/
public static String getWeekZhouOfDate(Date dt) {
String[] weekDays = { "鍛ㄦ棩", "鍛ㄤ竴", "鍛ㄤ簩", "鍛ㄤ笁", "鍛ㄥ洓", "鍛ㄤ簲", "鍛ㄥ叚" };
- Calendar cal = Calendar.getInstance();
+ TimeZone china = TimeZone.getTimeZone("Asia/Shanghai");
+ Calendar cal = Calendar.getInstance(china);
cal.setTime(dt);
int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
@@ -3605,6 +3623,13 @@
return getDayEndTime(cal.getTime());
}
+ public static String getDateStrOfUTCStr(String utcDate){
+ ZonedDateTime utcTime = ZonedDateTime.parse(utcDate,
+ DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssX").withZone(ZoneId.of("UTC")));
+ // 杞崲涓哄寳浜椂闂�
+ ZonedDateTime beijingTime = utcTime.withZoneSameInstant(ZoneId.of("Asia/Shanghai"));
+ return beijingTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ }
// 鑾峰彇褰撳ぉ鐨勫紑濮嬫椂闂�
public static java.util.Date getDayBegin() {
Calendar cal = new GregorianCalendar();
--
Gitblit v1.9.3