From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 16 五月 2022 10:14:24 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 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 1be0f40..9d37dcd 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
@@ -1,57 +1,58 @@
package com.genersoft.iot.vmp.utils;
-import java.text.ParseException;
+
import java.text.SimpleDateFormat;
-import java.util.Date;
+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.TemporalAccessor;
+
import java.util.Locale;
/**
* 鍏ㄥ眬鏃堕棿宸ュ叿绫�
- * @author swwheihei
+ * @author lin
*/
public class DateUtil {
private static final String yyyy_MM_dd_T_HH_mm_ss_SSSXXX = "yyyy-MM-dd'T'HH:mm:ss";
- private static final String yyyy_MM_dd_HH_mm_ss = "yyyy-MM-dd HH:mm:ss";
+ public static final String yyyy_MM_dd_HH_mm_ss = "yyyy-MM-dd HH:mm:ss";
public static final SimpleDateFormat formatISO8601 = new SimpleDateFormat(yyyy_MM_dd_T_HH_mm_ss_SSSXXX, Locale.getDefault());
public static final SimpleDateFormat format = new SimpleDateFormat(yyyy_MM_dd_HH_mm_ss, Locale.getDefault());
- public static String yyyy_MM_dd_HH_mm_ssToISO8601(String formatTime) {
+ public static final DateTimeFormatter formatterISO8601 = DateTimeFormatter.ofPattern(yyyy_MM_dd_T_HH_mm_ss_SSSXXX, Locale.getDefault()).withZone(ZoneId.systemDefault());
+ public static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(yyyy_MM_dd_HH_mm_ss, Locale.getDefault()).withZone(ZoneId.systemDefault());
- try {
- return formatISO8601.format(format.parse(formatTime));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return "";
+ public static String yyyy_MM_dd_HH_mm_ssToISO8601(String formatTime) {
+ return formatterISO8601.format(formatter.parse(formatTime));
}
public static String ISO8601Toyyyy_MM_dd_HH_mm_ss(String formatTime) {
+ return formatter.format(formatterISO8601.parse(formatTime));
- try {
- return format.format(formatISO8601.parse(formatTime));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return "";
}
public static long yyyy_MM_dd_HH_mm_ssToTimestamp(String formatTime) {
- //璁剧疆瑕佽鍙栫殑鏃堕棿瀛楃涓叉牸寮�
- Date date;
- try {
- date = format.parse(formatTime);
- Long timestamp=date.getTime()/1000;
- //杞崲涓篋ate绫�
- return timestamp;
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return 0;
+ TemporalAccessor temporalAccessor = formatter.parse(formatTime);
+ Instant instant = Instant.from(temporalAccessor);
+ return instant.getEpochSecond();
}
public static String getNow() {
- return format.format(System.currentTimeMillis());
+ LocalDateTime nowDateTime = LocalDateTime.now();
+ return formatter.format(nowDateTime);
+ }
+
+ public static boolean verification(String timeStr, DateTimeFormatter dateTimeFormatter) {
+ try {
+ LocalDate.parse(timeStr, dateTimeFormatter);
+ return true;
+ }catch (DateTimeParseException exception) {
+ return false;
+ }
}
}
--
Gitblit v1.8.0