From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 112 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
old mode 100644
new mode 100755
index 251570a..f6f60d7
--- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
@@ -1,12 +1,15 @@
package com.genersoft.iot.vmp.utils;
+import org.apache.commons.lang3.ObjectUtils;
+
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAccessor;
import java.util.Locale;
@@ -28,15 +31,40 @@
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";
+
+ /**
+ * wvp鍐呴儴缁熶竴鏃堕棿鏍煎紡
+ */
+ 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 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));
public static String yyyy_MM_dd_HH_mm_ssToISO8601(String formatTime) {
@@ -44,7 +72,19 @@
}
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) {
+ return formatter.format(urlFormatter.parse(formatTime));
}
/**
@@ -59,6 +99,50 @@
}
/**
+ * 鏃堕棿鎴� 杞� 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_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) {
+ Instant instant = Instant.ofEpochMilli(timestamp);
+ return DateFormatter.format(LocalDateTime.ofInstant(instant, ZoneId.of(zoneStr)));
+ }
+
+ /**
* 鑾峰彇褰撳墠鏃堕棿
* @return
*/
@@ -66,6 +150,16 @@
LocalDateTime nowDateTime = LocalDateTime.now();
return formatter.format(nowDateTime);
}
+
+ /**
+ * 鑾峰彇褰撳墠鏃堕棿
+ * @return
+ */
+ public static String getNowForUrl() {
+ LocalDateTime nowDateTime = LocalDateTime.now();
+ return urlFormatter.format(nowDateTime);
+ }
+
/**
* 鏍煎紡鏍￠獙
@@ -86,4 +180,21 @@
LocalDateTime nowDateTime = LocalDateTime.now();
return formatterISO8601.format(nowDateTime);
}
+
+ public static long getDifferenceForNow(String keepaliveTime) {
+ if (ObjectUtils.isEmpty(keepaliveTime)) {
+ return 0;
+ }
+ 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