From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:52:46 +0800
Subject: [PATCH] 最新版本541200007

---
 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java |  180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 178 insertions(+), 2 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index afb3039..cf8b45b 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -2911,8 +2911,8 @@
 //            System.out.println(DateUtil.afterMinutesDate(-5));
 
 
-            System.out.println(DateUtil.getBeforMonthStr(new Date(),1));
-            System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
+            System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
+//            System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
 
 //            List<Date> list =getThisMonthDateList();
 //            for(Date d :list){
@@ -3405,4 +3405,180 @@
         return dateBeforeDay.toString();
     }
 
+
+    /**
+     * 鑾峰彇X骞村悗鐨勬棩鏈�
+     * @param date
+     * @param beforMonths 涓嬪勾 -1  涓婂勾 1
+     * @return
+     */
+    public static String getBeforYear(Date date,Integer beforMonths){
+        ZonedDateTime zonedDateTime = date.toInstant().atZone(ZoneId.systemDefault());
+        // 杞崲涓簀ava.time.LocalDate,璁$畻x澶╃殑鏃ユ湡
+        LocalDate dateBeforeDay = zonedDateTime.toLocalDate().minusYears(beforMonths);
+        return dateBeforeDay.toString();
+    }
+
+
+
+    // 鑾峰彇鏈懆鐨勫紑濮嬫椂闂�
+    public static Date getBeginDayOfWeek(int addYears) {
+        Date date = new Date();
+        if (date == null) {
+            return null;
+        }
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.YEAR,getNowYearNum()+addYears);
+        int dayofweek = cal.get(Calendar.DAY_OF_WEEK);
+        if (dayofweek == 1) {
+            dayofweek += 7;
+        }
+        cal.add(Calendar.DATE, 2 - dayofweek);
+        return getDayStartTime(cal.getTime());
+    }
+
+    // 鑾峰彇鏈懆鐨勭粨鏉熸椂闂�
+    public static Date getEndDayOfWeek(int addYears) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getBeginDayOfWeek(addYears));
+        cal.add(Calendar.DAY_OF_WEEK, 6);
+        Date weekEndSta = cal.getTime();
+        return getDayEndTime(weekEndSta);
+    }
+
+    // 鑾峰彇涓婂懆鐨勫紑濮嬫椂闂�
+    public static Date getBeginDayOfLastWeek() {
+        Date date = new Date();
+        if (date == null) {
+            return null;
+        }
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.YEAR,getNowYearNum());
+        int dayofweek = cal.get(Calendar.DAY_OF_WEEK);
+        if (dayofweek == 1) {
+            dayofweek += 7;
+        }
+        cal.add(Calendar.DATE, 2 - dayofweek - 7);
+        return getDayStartTime(cal.getTime());
+    }
+
+    // 鑾峰彇涓婂懆鐨勭粨鏉熸椂闂�
+    public static Date getEndDayOfLastWeek() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getBeginDayOfLastWeek());
+        cal.add(Calendar.DAY_OF_WEEK, 6);
+        Date weekEndSta = cal.getTime();
+        return getDayEndTime(weekEndSta);
+    }
+
+    // 鑾峰彇鏈湀鐨勫紑濮嬫椂闂�
+    public static Date getBeginDayOfMonth(int addYears) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(getNowYearNum()+addYears, getNowMonthNum() - 1, 1);
+        return getDayStartTime(calendar.getTime());
+    }
+
+    // 鑾峰彇鏈湀鐨勭粨鏉熸椂闂�
+    public static Date getEndDayOfMonth(int addYears) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(getNowYearNum()+addYears, getNowMonthNum() - 1, 1);
+        int day = calendar.getActualMaximum(5);
+        calendar.set(getNowYearNum()+addYears, getNowMonthNum() - 1, day);
+        return getDayEndTime(calendar.getTime());
+    }
+
+    // 鑾峰彇涓婃湀鐨勫紑濮嬫椂闂�
+    public static Date getBeginDayOfLastMonth() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(getNowYearNum(), getNowMonthNum() - 2, 1);
+        return getDayStartTime(calendar.getTime());
+    }
+
+    // 鑾峰彇涓婃湀鐨勭粨鏉熸椂闂�
+    public static Date getEndDayOfLastMonth() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(getNowYearNum(), getNowMonthNum() - 2, 1);
+        int day = calendar.getActualMaximum(5);
+        calendar.set(getNowYearNum(), getNowMonthNum() - 2, day);
+        return getDayEndTime(calendar.getTime());
+    }
+
+    // 鑾峰彇鏈勾鐨勫紑濮嬫椂闂�
+    public static Date getBeginDayOfYear(int addYears) {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, getNowYearNum()+addYears);
+        cal.set(Calendar.MONTH, Calendar.JANUARY);
+        cal.set(Calendar.DATE, 1);
+        return getDayStartTime(cal.getTime());
+    }
+
+    // 鑾峰彇鏈勾鐨勭粨鏉熸椂闂�
+    public static java.util.Date getEndDayOfYear(int addYears){
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, getNowYearNum()+addYears);
+        cal.set(Calendar.MONTH, Calendar.DECEMBER);
+        cal.set(Calendar.DATE, 31);
+        return getDayEndTime(cal.getTime());
+    }
+
+    // 鑾峰彇褰撳ぉ鐨勫紑濮嬫椂闂�
+    public static java.util.Date getDayBegin() {
+        Calendar cal = new GregorianCalendar();
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+    }
+
+    // 鑾峰彇褰撳ぉ鐨勭粨鏉熸椂闂�
+    public static java.util.Date getDayEnd() {
+        Calendar cal = new GregorianCalendar();
+        cal.set(Calendar.HOUR_OF_DAY, 23);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.SECOND, 59);
+        return cal.getTime();
+    }
+
+
+    // 鑾峰彇鏌愪釜鏃ユ湡鐨勫紑濮嬫椂闂�
+    public static Timestamp getDayStartTime(Date d) {
+        Calendar calendar = Calendar.getInstance();
+        if (null != d)
+            calendar.setTime(d);
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
+                calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return new Timestamp(calendar.getTimeInMillis());
+    }
+
+    // 鑾峰彇鏌愪釜鏃ユ湡鐨勭粨鏉熸椂闂�
+    public static Timestamp getDayEndTime(Date d) {
+        Calendar calendar = Calendar.getInstance();
+        if (null != d)
+            calendar.setTime(d);
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
+                calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
+        calendar.set(Calendar.MILLISECOND, 999);
+        return new Timestamp(calendar.getTimeInMillis());
+    }
+
+
+    // 鑾峰彇浠婂勾鏄摢涓�骞�
+    public static Integer getNowYearNum() {
+        Date date = new Date();
+        GregorianCalendar gc = (GregorianCalendar) Calendar.getInstance();
+        gc.setTime(date);
+        return Integer.valueOf(gc.get(1));
+    }
+
+    // 鑾峰彇鏈湀鏄摢涓�鏈�
+    public static int getNowMonthNum() {
+        Date date = new Date();
+        GregorianCalendar gc = (GregorianCalendar) Calendar.getInstance();
+        gc.setTime(date);
+        return gc.get(2) + 1;
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3