From 1bca1b9c61676b48cc3137d3003e520c75ecdd92 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 13 一月 2024 10:57:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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..d777ac4 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
@@ -1,6 +1,7 @@
package com.ruoyi.common.utils;
import java.lang.management.ManagementFactory;
+import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -8,6 +9,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;
@@ -27,7 +29,7 @@
public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
- public static String YYYY_MM_DD_HH_MM_SS_MS = "yyyy-MM-dd HH:mm:ss.fff";
+ public static String YYYY_MM_DD_HH_MM_SS_MS = "yyyy-MM-dd HH:mm:ss.SSS";
public static String HH_MM_SS = "HH:mm:ss";
private static String[] parsePatterns = {
@@ -83,6 +85,21 @@
}
}
+ /**
+ * 杞崲Date鍘绘帀姣
+ */
+ public static final Date covertTime(Date date) {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Timestamp now = new Timestamp(date.getTime());
+ String str = df.format(now);
+ Date newDate = null;
+ try {
+ newDate = df.parse(str);
+ } catch (ParseException e) {
+ throw new RuntimeException("杞崲鏃ユ湡鍘绘帀姣寮傚父");
+ }
+ return newDate;
+ }
/**
* 鏃ユ湡璺緞 鍗冲勾/鏈�/鏃� 濡�2018/08/08
*/
@@ -204,7 +221,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