From 8870ea2ebf66b589c83f1d515faeec9bc4c6431e Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期一, 28 七月 2025 14:01:51 +0800
Subject: [PATCH] 实时故障添加租户、设备区分
---
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
index 427d8c5..8f3e5ac 100755
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
@@ -8,8 +8,12 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -767,15 +771,35 @@
* @return
*/
public static String zone2Str(String st) {
- // 瑙ｆ瀽瀛楃涓蹭负ZonedDateTime瀵硅薄
- ZonedDateTime zonedDateTime = ZonedDateTime.parse(st);
- // 杞崲涓轰腑鍥芥爣鍑嗘椂闂达紙UTC+8锛�
- ZonedDateTime cstDateTime = zonedDateTime.withZoneSameInstant(java.time.ZoneOffset.ofHours(8));
- // 瀹氫箟鎯宠鐨勮緭鍑烘牸寮�
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- // 鏍煎紡鍖栦负鎯宠鐨勫瓧绗︿覆
- String str = cstDateTime.format(formatter);
- return str;
+ try {
+ // 灏濊瘯瑙ｆ瀽涓烘椂闂存埑锛堟暟瀛楋級
+ if (st.matches("^\\d+$")) {
+ long timestamp = Long.parseLong(st);
+ // 鍋囪鏃堕棿鎴虫槸绉掔骇锛屽鏋滄槸姣绾у垯涓嶉渶瑕� *1000
+ Instant instant = Instant.ofEpochSecond(timestamp);
+ return instant.atZone(ZoneOffset.ofHours(8))
+ .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ }
+
+ // 灏濊瘯瑙ｆ瀽涓哄父瑙勬棩鏈熸椂闂存牸寮�
+ try {
+ LocalDateTime localDateTime = LocalDateTime.parse(st,
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ return localDateTime.atZone(ZoneOffset.ofHours(8))
+ .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ } catch (DateTimeParseException e) {
+ // 涓嶆槸甯歌鏍煎紡锛岀户缁皾璇昛onedDateTime鐨勯粯璁ゆ牸寮�
+ }
+
+ // 灏濊瘯瑙ｆ瀽涓篫onedDateTime鐨勯粯璁ゆ牸寮�
+ ZonedDateTime zonedDateTime = ZonedDateTime.parse(st);
+ return zonedDateTime.withZoneSameInstant(ZoneOffset.ofHours(8))
+ .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
}
/**
--
Gitblit v1.9.3