From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java | 131 ++++++++++++++++++++++++++++++++-----------
1 files changed, 97 insertions(+), 34 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 1be0f40..1abf2c6
--- 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,120 @@
package com.genersoft.iot.vmp.utils;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+
+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;
/**
* 鍏ㄥ眬鏃堕棿宸ュ叿绫�
- * @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";
+ /**
+ * 鍏煎涓嶈鑼冪殑iso8601鏃堕棿鏍煎紡
+ */
+ private static final String ISO8601_COMPATIBLE_PATTERN = "yyyy-M-d'T'H:m:s";
- 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());
+ /**
+ * 鐢ㄤ互杈撳嚭鏍囧噯鐨刬so8601鏃堕棿鏍煎紡
+ */
+ private static final String ISO8601_PATTERN = "yyyy-MM-dd'T'HH:mm:ss";
+
+ /**
+ * wvp鍐呴儴缁熶竴鏃堕棿鏍煎紡
+ */
+ public static final String PATTERN = "yyyy-MM-dd HH:mm:ss";
+
+ /**
+ * wvp鍐呴儴缁熶竴鏃堕棿鏍煎紡
+ */
+ public static final String URL_PATTERN = "yyyyMMddHHmmss";
+
+ 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 formatter = DateTimeFormatter.ofPattern(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) {
- try {
- return formatISO8601.format(format.parse(formatTime));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return "";
+ return formatterISO8601.format(formatter.parse(formatTime));
}
public static String ISO8601Toyyyy_MM_dd_HH_mm_ss(String formatTime) {
-
- try {
- return format.format(formatISO8601.parse(formatTime));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return "";
+ return formatter.format(formatterCompatibleISO8601.parse(formatTime));
}
-
+
+ public static String urlToyyyy_MM_dd_HH_mm_ss(String formatTime) {
+ return formatter.format(urlFormatter.parse(formatTime));
+ }
+
+ /**
+ * yyyy_MM_dd_HH_mm_ss 杞椂闂存埑
+ * @param formatTime
+ * @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();
}
+ /**
+ * 鑾峰彇褰撳墠鏃堕棿
+ * @return
+ */
public static String getNow() {
- return format.format(System.currentTimeMillis());
+ LocalDateTime nowDateTime = LocalDateTime.now();
+ return formatter.format(nowDateTime);
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鏃堕棿
+ * @return
+ */
+ public static String getNowForUrl() {
+ LocalDateTime nowDateTime = LocalDateTime.now();
+ return urlFormatter.format(nowDateTime);
+ }
+
+
+ /**
+ * 鏍煎紡鏍￠獙
+ * @param timeStr 鏃堕棿瀛楃涓�
+ * @param dateTimeFormatter 寰呮牎楠岀殑鏍煎紡
+ * @return
+ */
+ public static boolean verification(String timeStr, DateTimeFormatter dateTimeFormatter) {
+ try {
+ LocalDate.parse(timeStr, dateTimeFormatter);
+ return true;
+ }catch (DateTimeParseException exception) {
+ return false;
+ }
+ }
+
+ public static String getNowForISO8601() {
+ 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());
}
}
--
Gitblit v1.8.0