From 45da688213220a584b7a3240ac36d242d8639fa3 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 28 Feb 2024 17:43:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E8=BD=A6=E5=9E=8B=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E5=9C=A8=E4=BA=A7=E8=BD=A6=E9=A2=84=E8=AD=A6=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=8F=90=E5=89=8D=E4=B8=80=E4=B8=AA=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/common/util/DateUtil.java    | 21 +++++++++++++++++++
 .../LawsStandardEarlyWarningServiceImpl.java  |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java
index 025b7cbc..54c7df6e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/DateUtil.java
@@ -134,6 +134,27 @@ public class DateUtil {
         return dayStrings;
     }
 
+    /**
+     * @Author: caihaohan
+     * @Date: 2024/2/28
+     * @Description: 获取当前天后一月的时间集合（字符串）
+     **/
+    public static List<String> getNextMonthDateAsString() {
+        LocalDate today = LocalDate.now();
+        LocalDate nextMonth = today.plusMonths(1);
+
+        List<String> dayStrings = new ArrayList<>();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        nextMonth = nextMonth.minusDays(1);
+        while (!today.isAfter(nextMonth)) {
+            dayStrings.add(today.format(formatter));
+            today = today.plusDays(1);
+        }
+
+        return dayStrings;
+    }
+
     /**
     * 加减 月份
     * @author LQT
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java
index 18961c48..6a1fd237 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java
@@ -75,9 +75,9 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa
      * @Description: 标准预警通用分页查询
      **/
     private IPage<StandardEarlyWarning> pageList(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize) {
-        // 获取当前日前一周的日期字符串集合
-        List<String> dayStrings = DateUtil.getNextWeekDateAsString();
-        log.info("标准预警：当前一周的日期为{}", StringUtils.join(dayStrings, ","));
+        // 获取当前日前一月的日期字符串集合
+        List<String> dayStrings = DateUtil.getNextMonthDateAsString();
+        log.info("标准预警：当前一月的日期为{}", StringUtils.join(dayStrings, ","));
         standardEarlyWarning.setDayStrings(dayStrings);
         Page<StandardEarlyWarning> page = new Page<>(pageNo, pageSize);
         IPage<StandardEarlyWarning> pageList = lawsStandardEarlyWarningMapper.pageList(page, standardEarlyWarning);