From 2a431ace3a7b7dcdd313bb2fa0eff5bb727946f8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 14:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/core/utils/DateUtil.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/core/utils/DateUtil.java b/server/src/main/java/doumeemes/core/utils/DateUtil.java
index eb0a9fa..fb8c603 100644
--- a/server/src/main/java/doumeemes/core/utils/DateUtil.java
+++ b/server/src/main/java/doumeemes/core/utils/DateUtil.java
@@ -10,6 +10,8 @@
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.Date;
import java.util.*;
@@ -3002,4 +3004,25 @@
cal.add(Calendar.MINUTE,minutes);
return cal.getTime();
}
-}
\ No newline at end of file
+
+ /**
+ * LocalDateTime to date
+ * @param now
+ * @return
+ */
+ public static LocalDateTime toDateLocalDateTime(Date now){
+ return LocalDateTime.ofInstant(now.toInstant(), ZoneId.systemDefault());
+ }
+
+
+ /**
+ * LocalDateTime to date
+ * @param localDateTime
+ * @return
+ */
+ public static Date toDate(LocalDateTime localDateTime){
+ Date from = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+ return from;
+ }
+
+}
--
Gitblit v1.9.3