From 20177f4d1331d5a85aa4f7ccdef8706ced3ef9d7 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 07 十一月 2023 18:07:57 +0800
Subject: [PATCH] # 实时车位信息
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 3004abe..4beed80 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
@@ -2309,7 +2309,7 @@
}
public static Date getDateFromString2(String strDate) {
if (StringUtils.isEmpty(strDate)) {
- return new Date(System.currentTimeMillis());
+ return null;
}
try {
return sdfLongTimePlus.parse(strDate);
@@ -3018,6 +3018,16 @@
long createTime =begin.getTime();//鑾峰彇鍒涘缓鏃堕棿鐨勬椂闂存埑
long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//鑾峰彇褰撳墠鏃堕棿鐨勬椂闂存埑
long diff=(currentTime-createTime)/1000/60;//鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勫垎閽�
+ return (int)diff + 1 ;
+ }
+
+ public static Integer between(Date begin, Date end) {
+ if(begin ==null ){
+ return 0;
+ }
+ long createTime =begin.getTime();//鑾峰彇鍒涘缓鏃堕棿鐨勬椂闂存埑
+ long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//鑾峰彇褰撳墠鏃堕棿鐨勬椂闂存埑
+ long diff=(currentTime-createTime)/1000/60;//鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勫垎閽�
return (int)diff;
}
--
Gitblit v1.9.3