From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:40:34 +0800
Subject: [PATCH] #获取正常还车
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 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 f96e181..faadb29 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
@@ -293,6 +293,15 @@
throw e;
}
}
+ public static String getShortDateStr(Date date) {
+ String nowDate = "";
+ try {
+ nowDate = sdfShort.format(date);
+ return nowDate;
+ } catch (Exception e) {
+ return null;
+ }
+ }
/**
* Descrption:鍙栧緱褰撳墠鏃ユ湡,鏍煎紡涓�:YYYY-MM-DD
@@ -2298,6 +2307,16 @@
return new Timestamp(System.currentTimeMillis());
}
}
+ public static Date getDateFromString2(String strDate) {
+ if (StringUtils.isEmpty(strDate)) {
+ return new Date(System.currentTimeMillis());
+ }
+ try {
+ return sdfLongTimePlus.parse(strDate);
+ } catch (Exception ex) {
+ return null;
+ }
+ }
// -----------------------------------------------------------------------
public static Date parseFromFormats(String aValue) {
@@ -2984,6 +3003,24 @@
return cal.getTime();
}
+
+ /**
+ * 2涓棩鏈熶箣闂寸浉宸垎閽熸暟
+ * @param begin
+ * @param end
+ * @return
+ */
+ public static Integer betweenMin(Date begin, Date end) {
+ if(begin ==null || end == 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;
+ }
+
+
/**
* 璁＄畻鑰楁椂
* @param start
@@ -3003,4 +3040,4 @@
return consuming.toString();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3