From 48d2fcc6e04d9fdf61e079d427186338a1816dba Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 13 十一月 2025 11:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 6213c15..176962f 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
@@ -2971,7 +2971,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));
@@ -3604,6 +3604,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