From b1c1c20ef382dd2be0f6bdf81f5d2913e749faef Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 11:12:02 +0800
Subject: [PATCH] 整理接口
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 d51d0f6..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
@@ -10,7 +10,6 @@
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.Duration;
import java.util.Date;
import java.util.*;
@@ -300,7 +299,7 @@
nowDate = sdfShort.format(date);
return nowDate;
} catch (Exception e) {
- throw e;
+ return null;
}
}
@@ -3011,11 +3010,11 @@
* @param end
* @return
*/
- public static long betweenMin(Date begin, Date end) {
+ 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 diff;
+ return (int)diff;
}
@@ -3038,4 +3037,4 @@
return consuming.toString();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3