From 5e66e66dc2561c86893d483cab57128ebbd9bc5b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 09 十月 2023 13:34:22 +0800
Subject: [PATCH] 集成mqtt
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 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..d51d0f6 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,6 +10,7 @@
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.Duration;
import java.util.Date;
import java.util.*;
@@ -287,6 +288,15 @@
try {
java.sql.Date date = null;
date = new java.sql.Date(new Date().getTime());
+ nowDate = sdfShort.format(date);
+ return nowDate;
+ } catch (Exception e) {
+ throw e;
+ }
+ }
+ public static String getShortDateStr(Date date) {
+ String nowDate = "";
+ try {
nowDate = sdfShort.format(date);
return nowDate;
} catch (Exception e) {
@@ -2298,6 +2308,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 +3004,21 @@
return cal.getTime();
}
+
+ /**
+ * 2涓棩鏈熶箣闂寸浉宸垎閽熸暟
+ * @param begin
+ * @param end
+ * @return
+ */
+ public static long 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;
+ }
+
+
/**
* 璁＄畻鑰楁椂
* @param start
--
Gitblit v1.9.3