From e1d476a54a7aa72f429e41e5c2957b77edbeb0a7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 13 三月 2024 15:24:09 +0800
Subject: [PATCH] 处理收到redis推动的推流设备信息内容重复的问题

---
 src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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 617d9f2..f8ba4f2 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,11 @@
 	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";
+
+    /**
      * wvp鍐呴儴缁熶竴鏃堕棿鏍煎紡
      */
     public static final String PATTERN = "yyyy-MM-dd HH:mm:ss";
@@ -49,6 +54,7 @@
 
     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 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 +65,13 @@
     }
 	
 	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));
+        }
+        return formatter.format(formatterISO8601.parse(formatTime));
     }
 
 	public static String urlToyyyy_MM_dd_HH_mm_ss(String formatTime) {
@@ -139,4 +151,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