guzijian / wvp-GB28181-pro · Commits

Commit debfac58b0bf5fc34230bc359080d07cd087e745

Authored by 648540858
1 parent d4f6ec39

时间解析兼容iso861带毫秒

Inline Side-by-side
Showing 1 changed file with 9 additions and 0 deletions
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
  View file @debfac5
@@ -36,6 +36,11 @@ public class DateUtil { @@ -36,6 +36,11 @@ public class DateUtil {
36 private static final String ISO8601_ZONE_PATTERN = "yyyy-MM-dd'T'HH:mm:ssXXX"; 36 private static final String ISO8601_ZONE_PATTERN = "yyyy-MM-dd'T'HH:mm:ssXXX";
37 37
38 /** 38 /**
  39 + * 兼容的时间格式 iso8601时间格式带毫秒
  40 + */
  41 + private static final String ISO8601_MILLISECOND_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS";
  42 +
  43 + /**
39 * wvp内部统一时间格式 44 * wvp内部统一时间格式
40 */ 45 */
41 public static final String PATTERN = "yyyy-MM-dd HH:mm:ss"; 46 public static final String PATTERN = "yyyy-MM-dd HH:mm:ss";
@@ -55,6 +60,8 @@ public class DateUtil { @@ -55,6 +60,8 @@ public class DateUtil {
55 public static final DateTimeFormatter formatterCompatibleISO8601 = DateTimeFormatter.ofPattern(ISO8601_COMPATIBLE_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr)); 60 public static final DateTimeFormatter formatterCompatibleISO8601 = DateTimeFormatter.ofPattern(ISO8601_COMPATIBLE_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
56 public static final DateTimeFormatter formatterISO8601 = DateTimeFormatter.ofPattern(ISO8601_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr)); 61 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)); 62 public static final DateTimeFormatter formatterZoneISO8601 = DateTimeFormatter.ofPattern(ISO8601_ZONE_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
  63 + public static final DateTimeFormatter formatterMillisecondISO8601 = DateTimeFormatter.ofPattern(ISO8601_MILLISECOND_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
  64 +
58 public static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr)); 65 public static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
59 public static final DateTimeFormatter DateFormatter = DateTimeFormatter.ofPattern(date_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr)); 66 public static final DateTimeFormatter DateFormatter = DateTimeFormatter.ofPattern(date_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
60 public static final DateTimeFormatter urlFormatter = DateTimeFormatter.ofPattern(URL_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr)); 67 public static final DateTimeFormatter urlFormatter = DateTimeFormatter.ofPattern(URL_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
@@ -70,6 +77,8 @@ public class DateUtil { @@ -70,6 +77,8 @@ public class DateUtil {
70 return formatter.format(formatterCompatibleISO8601.parse(formatTime)); 77 return formatter.format(formatterCompatibleISO8601.parse(formatTime));
71 } else if (verification(formatTime, formatterZoneISO8601)) { 78 } else if (verification(formatTime, formatterZoneISO8601)) {
72 return formatter.format(formatterZoneISO8601.parse(formatTime)); 79 return formatter.format(formatterZoneISO8601.parse(formatTime));
  80 + } else if (verification(formatTime, formatterMillisecondISO8601)) {
  81 + return formatter.format(formatterMillisecondISO8601.parse(formatTime));
73 } 82 }
74 return formatter.format(formatterISO8601.parse(formatTime)); 83 return formatter.format(formatterISO8601.parse(formatTime));
75 } 84 }