From b7ad0a907f59a2bc0455565e76c12bf152016469 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 27 十月 2023 18:06:46 +0800
Subject: [PATCH] 合并pr 优化sql
---
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 23cb9da..617d9f2
--- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
@@ -1,6 +1,8 @@
package com.genersoft.iot.vmp.utils;
+import org.apache.commons.lang3.ObjectUtils;
+
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -38,11 +40,17 @@
*/
public static final String URL_PATTERN = "yyyyMMddHHmmss";
+ /**
+ * 鏃ユ湡鏍煎紡
+ */
+ public static final String date_PATTERN = "yyyy-MM-dd";
+
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 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));
public static String yyyy_MM_dd_HH_mm_ssToISO8601(String formatTime) {
@@ -68,6 +76,22 @@
Instant instant = Instant.from(temporalAccessor);
return instant.getEpochSecond();
}
+
+ /**
+ * 鏃堕棿鎴� 杞� yyyy_MM_dd_HH_mm_ss
+ */
+ public static String timestampTo_yyyy_MM_dd_HH_mm_ss(long timestamp) {
+ Instant instant = Instant.ofEpochSecond(timestamp);
+ return formatter.format(LocalDateTime.ofInstant(instant, ZoneId.of(zoneStr)));
+ }
+
+ /**
+ * 鏃堕棿鎴� 杞� yyyy_MM_dd
+ */
+ public static String timestampTo_yyyy_MM_dd(long timestamp) {
+ Instant instant = Instant.ofEpochMilli(timestamp);
+ return DateFormatter.format(LocalDateTime.ofInstant(instant, ZoneId.of(zoneStr)));
+ }
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -109,6 +133,9 @@
}
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