From 1909c7f71fc1b0e290678a3efe95b62d0b9df75e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 六月 2024 10:08:09 +0800
Subject: [PATCH] 调整参数名称
---
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 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 e5f9fe4..f6f60d7 100755
--- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
@@ -31,6 +31,16 @@
private static final String ISO8601_PATTERN = "yyyy-MM-dd'T'HH:mm:ss";
/**
+ * iso8601鏃堕棿鏍煎紡甯︽椂鍖猴紝渚嬪锛�2024-02-21T11:10:36+08:00
+ */
+ 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";
@@ -49,6 +59,9 @@
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));
@@ -59,7 +72,15 @@
}
public static String ISO8601Toyyyy_MM_dd_HH_mm_ss(String formatTime) {
- return formatter.format(formatterCompatibleISO8601.parse(formatTime));
+ // 涓夌鏃ユ湡鏍煎紡閮藉皾璇曪紝涓轰簡鍏煎涓嶅悓鍘傚鐨勬棩鏈熸牸寮�
+ if (verification(formatTime, formatterCompatibleISO8601)) {
+ 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));
}
public static String urlToyyyy_MM_dd_HH_mm_ss(String formatTime) {
@@ -86,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