From 100022251e85ee48cf4ed5336f7514eb288ce11e Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=B8=B8=E8=A7=84=E5=81=87?= =?UTF-8?q?=E6=9C=9F,=E5=8F=AF=E4=BB=A5=E8=8E=B7=E5=8F=96=E5=88=B0?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=B9=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/calendar/CalendarServiceImpl.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/calendar/CalendarServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/calendar/CalendarServiceImpl.java index 96c0506..1337ee9 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/calendar/CalendarServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/calendar/CalendarServiceImpl.java @@ -31,23 +31,24 @@ public class CalendarServiceImpl implements CalendarService { @Resource private CalendarMapper calendarMapper; + private static final int YEAR = LocalDate.now().getYear(); // 假期日期,改用 LocalDate 存储 private static final Set HOLIDAYS; static { Set holidays = new HashSet<>(); - holidays.add(LocalDate.of(2024, 1, 1)); // 元旦 - holidays.add(LocalDate.of(2024, 5, 1)); // 劳动节 - holidays.add(LocalDate.of(2024, 5, 2)); - holidays.add(LocalDate.of(2024, 5, 3)); - holidays.add(LocalDate.of(2024, 5, 4)); - holidays.add(LocalDate.of(2024, 5, 5)); - holidays.add(LocalDate.of(2024, 10, 1)); // 国庆节 - holidays.add(LocalDate.of(2024, 10, 2)); - holidays.add(LocalDate.of(2024, 10, 3)); - holidays.add(LocalDate.of(2024, 10, 4)); - holidays.add(LocalDate.of(2024, 10, 5)); - holidays.add(LocalDate.of(2024, 10, 6)); - holidays.add(LocalDate.of(2024, 10, 7)); + holidays.add(LocalDate.of(YEAR, 1, 1)); // 元旦 + holidays.add(LocalDate.of(YEAR, 5, 1)); // 劳动节 + holidays.add(LocalDate.of(YEAR, 5, 2)); + holidays.add(LocalDate.of(YEAR, 5, 3)); + holidays.add(LocalDate.of(YEAR, 5, 4)); + holidays.add(LocalDate.of(YEAR, 5, 5)); + holidays.add(LocalDate.of(YEAR, 10, 1)); // 国庆节 + holidays.add(LocalDate.of(YEAR, 10, 2)); + holidays.add(LocalDate.of(YEAR, 10, 3)); + holidays.add(LocalDate.of(YEAR, 10, 4)); + holidays.add(LocalDate.of(YEAR, 10, 5)); + holidays.add(LocalDate.of(YEAR, 10, 6)); + holidays.add(LocalDate.of(YEAR, 10, 7)); // 将 Set 转为不可变集合 HOLIDAYS = Collections.unmodifiableSet(holidays);