From 15ec9481bb9768378a512530a8facb4dccdd62f6 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 18 二月 2025 14:51:07 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/core/utils/DateUtil.java |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 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 0507d29..8f8188e 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,9 @@
 import java.text.DateFormatSymbols;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.*;
 
@@ -39,7 +42,18 @@
 
     public DateUtil() {
     }
+    public static Date getDateFromLocalDateTime(  LocalDateTime localDateTime) {
+        try {
+            ZoneId zoneId = ZoneId.systemDefault(); // 鑾峰彇绯荤粺榛樿鏃跺尯
+            ZonedDateTime zonedDateTime = localDateTime.atZone(zoneId); // 杞崲涓哄甫鏃跺尯鐨勬棩鏈熸椂闂�
+            Date date = Date.from(zonedDateTime.toInstant()); // 杞崲涓篋ate
+            return  date;
+        }catch (Exception e){
 
+        }
+        return null;
+
+    }
     public static Date StringToDate2(String DATE) {
         if(StringUtils.isBlank(DATE)){
             return null;
@@ -52,6 +66,15 @@
             exception.printStackTrace();
         }
         return dt1;
+    }
+
+    public static String getXDaysAfter(Date date, Integer days){
+        Timestamp currentTimestamp = new Timestamp(date.getTime());
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(currentTimestamp);
+        calendar.add(Calendar.DAY_OF_YEAR, days-1); // 鍦ㄥ綋鍓嶆椂闂村熀纭�涓婃坊鍔犳寚瀹氱殑澶╂暟
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        return formatter.format(calendar.getTime());
     }
 
     /**
@@ -2309,7 +2332,7 @@
     }
     public static Date getDateFromString2(String strDate) {
         if (StringUtils.isEmpty(strDate)) {
-            return new Date(System.currentTimeMillis());
+            return null;
         }
         try {
             return sdfLongTimePlus.parse(strDate);
@@ -3021,6 +3044,26 @@
         return (int)diff + 1 ;
     }
 
+    public static Integer between(Date begin, Date end) {
+        if(begin ==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;
+    }
+
+    public static Integer betweenSeconds(Date begin, Date end) {
+        if(begin ==null ){
+            return  0;
+        }
+        long createTime =begin.getTime();//鑾峰彇鍒涘缓鏃堕棿鐨勬椂闂存埑
+        long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//鑾峰彇褰撳墠鏃堕棿鐨勬椂闂存埑
+        long diff=(currentTime-createTime)/1000;//鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勫垎閽�
+        return (int)diff;
+    }
+
 
     /**
      * 璁$畻鑰楁椂

--
Gitblit v1.9.3