From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
index 775e25a..e217bb5 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
@@ -5,6 +5,10 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -1168,6 +1172,28 @@
return calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
}
+ /**
+ * date转localdate
+ * @param date
+ * @return
+ */
+ public static LocalDate dateToLocalDate(Date date){
+ ZoneId zoneId = ZoneId.systemDefault();
+ Instant instant = date.toInstant();
+ return instant.atZone(zoneId).toLocalDate();
+ }
+
+ /**
+ * date转localdatetime
+ * @param date
+ * @return
+ */
+ public static LocalDateTime dateToLocalDateTime(Date date){
+ ZoneId zoneId = ZoneId.systemDefault();
+ Instant instant = date.toInstant();
+ return instant.atZone(zoneId).toLocalDateTime();
+ }
+
public static void main(String[] args) throws ParseException {
--
Gitblit v1.7.1