guzijian / wvp-GB28181-pro · Commits

Commit 5a6044ef4e22dd4ff7409bdc10f5b68f66449ed0

Authored by 648540858
Committed by GitHub
2 parents e932a9b8 268869c6

Merge pull request #1336 from wendy512/bugfix 

bugfix：修复紫光华智录像查询返回日期为2024-02-21T11:10:36+08:00解析报错，兼容多种不同日期格式
Inline Side-by-side
Showing 1 changed file with 13 additions and 1 deletions
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
  View file @5a6044e
@@ -31,6 +31,11 @@ public class DateUtil { @@ -31,6 +31,11 @@ public class DateUtil {
31 private static final String ISO8601_PATTERN = "yyyy-MM-dd'T'HH:mm:ss"; 31 private static final String ISO8601_PATTERN = "yyyy-MM-dd'T'HH:mm:ss";
32 32
33 /** 33 /**
  34 + * iso8601时间格式带时区，例如：2024-02-21T11:10:36+08:00
  35 + */
  36 + private static final String ISO8601_ZONE_PATTERN = "yyyy-MM-dd'T'HH:mm:ssXXX";
  37 +
  38 + /**
34 * wvp内部统一时间格式 39 * wvp内部统一时间格式
35 */ 40 */
36 public static final String PATTERN = "yyyy-MM-dd HH:mm:ss"; 41 public static final String PATTERN = "yyyy-MM-dd HH:mm:ss";
@@ -49,6 +54,7 @@ public class DateUtil { @@ -49,6 +54,7 @@ public class DateUtil {
49 54
50 public static final DateTimeFormatter formatterCompatibleISO8601 = DateTimeFormatter.ofPattern(ISO8601_COMPATIBLE_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr)); 55 public static final DateTimeFormatter formatterCompatibleISO8601 = DateTimeFormatter.ofPattern(ISO8601_COMPATIBLE_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
51 public static final DateTimeFormatter formatterISO8601 = DateTimeFormatter.ofPattern(ISO8601_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr)); 56 public static final DateTimeFormatter formatterISO8601 = DateTimeFormatter.ofPattern(ISO8601_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
  57 + public static final DateTimeFormatter formatterZoneISO8601 = DateTimeFormatter.ofPattern(ISO8601_ZONE_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
52 public static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr)); 58 public static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
53 public static final DateTimeFormatter DateFormatter = DateTimeFormatter.ofPattern(date_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr)); 59 public static final DateTimeFormatter DateFormatter = DateTimeFormatter.ofPattern(date_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
54 public static final DateTimeFormatter urlFormatter = DateTimeFormatter.ofPattern(URL_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr)); 60 public static final DateTimeFormatter urlFormatter = DateTimeFormatter.ofPattern(URL_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
@@ -59,7 +65,13 @@ public class DateUtil { @@ -59,7 +65,13 @@ public class DateUtil {
59 } 65 }
60 66
61 public static String ISO8601Toyyyy_MM_dd_HH_mm_ss(String formatTime) { 67 public static String ISO8601Toyyyy_MM_dd_HH_mm_ss(String formatTime) {
62 - return formatter.format(formatterCompatibleISO8601.parse(formatTime)); 68 + // 三种日期格式都尝试，为了兼容不同厂家的日期格式
  69 + if (verification(formatTime, formatterCompatibleISO8601)) {
  70 + return formatter.format(formatterCompatibleISO8601.parse(formatTime));
  71 + } else if (verification(formatTime, formatterZoneISO8601)) {
  72 + return formatter.format(formatterZoneISO8601.parse(formatTime));
  73 + }
  74 + return formatter.format(formatterISO8601.parse(formatTime));
63 } 75 }
64 76
65 public static String urlToyyyy_MM_dd_HH_mm_ss(String formatTime) { 77 public static String urlToyyyy_MM_dd_HH_mm_ss(String formatTime) {