From b5d02520af582a86aa95d7903558a5bf50a77aa7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 17 六月 2025 16:12:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
index 1a41d3e..34592cb 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
@@ -6,9 +6,7 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.ZoneId;
+import java.time.*;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
import java.util.*;
@@ -1086,4 +1084,32 @@
return dateString;
}
+
+ /**
+ * Date涓嶭ocalDateTime浜掔浉杞崲鐨勫伐鍏锋柟娉�
+ *
+ * @param date
+ * @return
+ */
+ public static LocalDateTime convertToLocalDateTime(Date date) {
+ if (date == null) {
+ return null;
+ }
+ return Instant.ofEpochMilli(date.getTime())
+ .atZone(ZoneId.systemDefault())
+ .toLocalDateTime();
+ }
+
+ /**
+ * Date涓嶭ocalDateTime浜掔浉杞崲鐨勫伐鍏锋柟娉�
+ *
+ * @param localDateTime
+ * @return
+ */
+ public static Date convertToDate(LocalDateTime localDateTime) {
+ if (localDateTime == null) {
+ return null;
+ }
+ return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+ }
}
--
Gitblit v1.9.3