From b15e559eae82db811b31f1e3c47e3be027f20e27 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 一月 2024 16:18:28 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 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 1abf2c6..e5f9fe4 100755
--- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
@@ -40,11 +40,17 @@
*/
public static final String URL_PATTERN = "yyyyMMddHHmmss";
+ /**
+ * 鏃ユ湡鏍煎紡
+ */
+ public static final String date_PATTERN = "yyyy-MM-dd";
+
public static final String zoneStr = "Asia/Shanghai";
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 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));
public static String yyyy_MM_dd_HH_mm_ssToISO8601(String formatTime) {
@@ -70,6 +76,22 @@
Instant instant = Instant.from(temporalAccessor);
return instant.getEpochSecond();
}
+
+ /**
+ * 鏃堕棿鎴� 杞� yyyy_MM_dd_HH_mm_ss
+ */
+ public static String timestampTo_yyyy_MM_dd_HH_mm_ss(long timestamp) {
+ Instant instant = Instant.ofEpochSecond(timestamp);
+ return formatter.format(LocalDateTime.ofInstant(instant, ZoneId.of(zoneStr)));
+ }
+
+ /**
+ * 鏃堕棿鎴� 杞� yyyy_MM_dd
+ */
+ public static String timestampTo_yyyy_MM_dd(long timestamp) {
+ Instant instant = Instant.ofEpochMilli(timestamp);
+ return DateFormatter.format(LocalDateTime.ofInstant(instant, ZoneId.of(zoneStr)));
+ }
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -117,4 +139,13 @@
Instant beforeInstant = Instant.from(formatter.parse(keepaliveTime));
return ChronoUnit.MILLIS.between(beforeInstant, Instant.now());
}
+
+ public static long getDifference(String startTime, String endTime) {
+ if (ObjectUtils.isEmpty(startTime) || ObjectUtils.isEmpty(endTime)) {
+ return 0;
+ }
+ Instant startInstant = Instant.from(formatter.parse(startTime));
+ Instant endInstant = Instant.from(formatter.parse(endTime));
+ return ChronoUnit.MILLIS.between(endInstant, startInstant);
+ }
}
--
Gitblit v1.8.0