From d9fe4b6ff40a964c895a452ea12a04a13a979ec4 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 04 十二月 2023 18:26:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/hx/util/DateUtil.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index 361a86c..29b40d0 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -813,4 +813,36 @@
         }
         return age;
     }
+
+    /**
+     * 鑾峰彇鏌愬ぉ缁撴潫绉掓暟
+     * @param dateTime      鏃ユ湡
+     * @param lateSecond    寤惰繜绉掓暟
+     * @return
+     */
+    public static long todayEndSecond(Date dateTime, Long lateSecond) {
+        if(dateTime == null){
+            dateTime = new Date();
+        }
+        if(lateSecond == null){
+            lateSecond = 0L;
+        }
+        Date endTime = DateUtil.dayToEndDate(dateTime);
+        return differSecond(dateTime, endTime) + lateSecond;
+    }
+
+    /**
+     * 璁$畻2涓疄闄呯浉宸鏁�
+     * @param startTime 寮�濮嬫椂闂�
+     * @param endTime   缁撴潫鏃堕棿
+     * @return
+     */
+    public static long differSecond(Date startTime, Date endTime) {
+        if(startTime == null || endTime == null){
+            return 0L;
+        }
+        long sTime = startTime.getTime();
+        long eTime = endTime.getTime();
+        return (eTime - sTime) / 1000L;
+    }
 }

--
Gitblit v1.8.0