From 90d9cd8ac8d7575d1cbd6e81ff6ed746ee82289f Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期二, 17 十月 2023 09:23:45 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java | 5 +++++
1 files changed, 5 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..1abf2c6
--- 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;
@@ -109,6 +111,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