From 402ffa0b1e6b0453338a57469e00903564ac53f5 Mon Sep 17 00:00:00 2001
From: linshunhua <my_lv@163.com>
Date: 星期二, 06 八月 2024 16:52:22 +0800
Subject: [PATCH] 修复在ORACLE,达梦等数据库下的用户查询BUG
---
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
index f8ba4f2..f6f60d7 100755
--- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
@@ -36,6 +36,11 @@
private static final String ISO8601_ZONE_PATTERN = "yyyy-MM-dd'T'HH:mm:ssXXX";
/**
+ * 鍏煎鐨勬椂闂存牸寮� iso8601鏃堕棿鏍煎紡甯︽绉�
+ */
+ private static final String ISO8601_MILLISECOND_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS";
+
+ /**
* wvp鍐呴儴缁熶竴鏃堕棿鏍煎紡
*/
public static final String PATTERN = "yyyy-MM-dd HH:mm:ss";
@@ -55,6 +60,8 @@
public static final DateTimeFormatter formatterCompatibleISO8601 = DateTimeFormatter.ofPattern(ISO8601_COMPATIBLE_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
public static final DateTimeFormatter formatterISO8601 = DateTimeFormatter.ofPattern(ISO8601_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
public static final DateTimeFormatter formatterZoneISO8601 = DateTimeFormatter.ofPattern(ISO8601_ZONE_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
+ public static final DateTimeFormatter formatterMillisecondISO8601 = DateTimeFormatter.ofPattern(ISO8601_MILLISECOND_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
+
public static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
public static final DateTimeFormatter DateFormatter = DateTimeFormatter.ofPattern(date_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
public static final DateTimeFormatter urlFormatter = DateTimeFormatter.ofPattern(URL_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
@@ -70,6 +77,8 @@
return formatter.format(formatterCompatibleISO8601.parse(formatTime));
} else if (verification(formatTime, formatterZoneISO8601)) {
return formatter.format(formatterZoneISO8601.parse(formatTime));
+ } else if (verification(formatTime, formatterMillisecondISO8601)) {
+ return formatter.format(formatterMillisecondISO8601.parse(formatTime));
}
return formatter.format(formatterISO8601.parse(formatTime));
}
@@ -98,6 +107,34 @@
}
/**
+ * 鏃堕棿鎴� 杞� yyyy_MM_dd_HH_mm_ss
+ */
+ public static String timestampMsToUrlToyyyy_MM_dd_HH_mm_ss(long timestamp) {
+ Instant instant = Instant.ofEpochMilli(timestamp);
+ return urlFormatter.format(LocalDateTime.ofInstant(instant, ZoneId.of(zoneStr)));
+ }
+
+ /**
+ * yyyy_MM_dd_HH_mm_ss 杞椂闂存埑锛堟绉掞級
+ *
+ * @param formatTime
+ * @return
+ */
+ public static long yyyy_MM_dd_HH_mm_ssToTimestampMs(String formatTime) {
+ TemporalAccessor temporalAccessor = formatter.parse(formatTime);
+ Instant instant = Instant.from(temporalAccessor);
+ return instant.toEpochMilli();
+ }
+
+ /**
+ * 鏃堕棿鎴筹紙姣锛� 杞� yyyy_MM_dd_HH_mm_ss
+ */
+ public static String timestampMsTo_yyyy_MM_dd_HH_mm_ss(long timestamp) {
+ Instant instant = Instant.ofEpochMilli(timestamp);
+ return formatter.format(LocalDateTime.ofInstant(instant, ZoneId.of(zoneStr)));
+ }
+
+ /**
* 鏃堕棿鎴� 杞� yyyy_MM_dd
*/
public static String timestampTo_yyyy_MM_dd(long timestamp) {
--
Gitblit v1.8.0