From 15220b607d14880a87ec6d7565c0d68cbe9b5ba4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 十月 2023 18:15:49 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/core/utils/DateUtil.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index c101128..4388eaa 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -299,7 +299,7 @@
             nowDate = sdfShort.format(date);
             return nowDate;
         } catch (Exception e) {
-            throw e;
+           return  null;
         }
     }
 
@@ -3003,6 +3003,21 @@
         return cal.getTime();
     }
 
+
+    /**
+     * 2涓棩鏈熶箣闂寸浉宸垎閽熸暟
+     * @param begin
+     * @param end
+     * @return
+     */
+    public static Integer betweenMin(Date begin, Date end) {
+        long createTime =begin.getTime();//鑾峰彇鍒涘缓鏃堕棿鐨勬椂闂存埑
+        long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//鑾峰彇褰撳墠鏃堕棿鐨勬椂闂存埑
+        long diff=(currentTime-createTime)/1000/60;//鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勫垎閽�
+        return (int)diff;
+    }
+
+
     /**
      * 璁$畻鑰楁椂
      * @param start
@@ -3022,4 +3037,4 @@
         return consuming.toString();
     }
 
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3