From 8c94232e63a6f28682e629dbfa92873d3cbf964a Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 22 九月 2023 11:11:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 60a46f4..3ff67fb 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -8,6 +8,7 @@
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.Date;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -204,7 +205,20 @@
// 鑾峰緱涓や釜鏃堕棿鐨勬绉掓椂闂村樊寮�
long diff = endDate.getTime() - nowDate.getTime();
// 璁＄畻宸灏戠//杈撳嚭缁撴灉
- long sec = diff % nd % nh % nm / ns;
+ long sec = diff/ ns;
return sec;
}
+
+ /**
+ * 鑾峰彇涓�澶╀腑鍓╀綑鐨勬椂闂达紙绉掓暟锛�
+ */
+ public static Integer getDayRemainingTime(Date currentDate) {
+ LocalDateTime midnight = LocalDateTime.ofInstant(currentDate.toInstant(),
+ ZoneId.systemDefault()).plusDays(1).withHour(0).withMinute(0)
+ .withSecond(0).withNano(0);
+ LocalDateTime currentDateTime = LocalDateTime.ofInstant(currentDate.toInstant(),
+ ZoneId.systemDefault());
+ long seconds = ChronoUnit.SECONDS.between(currentDateTime, midnight);
+ return (int) seconds;
+ }
}
--
Gitblit v1.9.3