From 68f99ca8fbf042b66ce2c21dfa2cd4369e74bf6c Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Tue, 8 Jul 2025 11:38:13 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EB=AC=B8=EC=9E=90=20=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=20=EC=9E=91=EC=97=85=20=EC=A4=91=20(2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/application/util/DateUiUtil.java | 24 +++++++-------- .../adapters/web/AutoSchedulesController.java | 2 +- .../application/AutoSchedulesService.java | 30 ++++++++++--------- .../mappers/schedule/AutoSchedulesMapper.xml | 8 ++--- 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java b/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java index 91a38816..58a73184 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java @@ -6,6 +6,7 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import org.springframework.stereotype.Component; @Component @@ -49,26 +50,21 @@ public class DateUiUtil { * @param day 오늘 날짜의 일(day of month) * @return DayRange 객체 또는 발송일이 아니면 null */ - public static DayRange getDayRange(int day) { + public static Optional getDayRange(int day) { LocalDate today = LocalDate.now(); int lastDay = today.lengthOfMonth(); - int fromDay; - int toDay; - + // 주간 범위 계산 if (day == 7) { - fromDay = day - 6; - toDay = day - 1; - } else if (day == 14 || day == 21) { - fromDay = day - 7; - toDay = day - 1; + return Optional.of(new DayRange(1, 6)); + } else if (day == 14) { + return Optional.of(new DayRange(7, 13)); + } else if (day == 21) { + return Optional.of(new DayRange(14, 20)); } else if (day == lastDay) { - fromDay = 21; - toDay = lastDay; + return Optional.of(new DayRange(21, lastDay)); } else { - return null; + return Optional.empty(); // 발송일 아님 } - - return new DayRange(fromDay, toDay); } } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java index 19a97949..0e8553c7 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java @@ -24,7 +24,7 @@ public class AutoSchedulesController { } // 매일 오후 5시 마다 실행되는 스케줄러 -// @Scheduled(cron = "0 0 17 * * ?") + @Scheduled(cron = "0 0 17 * * ?") public void fetchSmsAutoSend() { portIn.sendAutoSms(); } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java index 91c4aa19..2ef1d06a 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import java.util.Optional; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; @Service @RequiredArgsConstructor @@ -41,24 +42,24 @@ class AutoSchedulesService implements AutoSchedulesPortIn { // 문자 자동 발송 활성화 상태 체크 if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) { - System.out.println("문자 발송 비활성화 상태입니다."); + System.out.println("문자 발송 비활성화 상태"); return Optional.of(false); } - + + String currentMonth = DateUiUtil.getCurrentMonthValue(); // 현재 월 LocalDate today = LocalDate.now(); int day = today.getDayOfMonth(); int lastDay = today.lengthOfMonth(); - // 현재 월 - String currentMonth = DateUiUtil.getCurrentMonthValue(); - + // 매월 7일, 24일, 21일, 말일 에만 발송 if (day == 7 || day == 14 || day == 21 || day == lastDay) { - DayRange dayRange = DateUiUtil.getDayRange(day); + DayRange dayRange = DateUiUtil.getDayRange(day).orElse(null); + if (dayRange == null) { return Optional.of(false); } - // 해당 날짜에 일계부 미등록한 임가 목록 조회 + // dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회 List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( new GetIncompleteHouseholdsCmd( @@ -66,13 +67,14 @@ class AutoSchedulesService implements AutoSchedulesPortIn { dayRange.getFromDay(), dayRange.getToDay())); - portOut.sendAutoSms(new CreateSmsAutoSendCmd( - incompleteHouseholds, - getSmsAutoStatus.getSendPhone(), - getSmsAutoStatus.getMessage() - )); - } else { - System.out.println("문자 발송일 아님: " + today); + // 미등록 임가가 있을 경우에만 실행 + if(!CollectionUtils.isEmpty(incompleteHouseholds)) { + portOut.sendAutoSms(new CreateSmsAutoSendCmd( + incompleteHouseholds, + getSmsAutoStatus.getSendPhone(), + getSmsAutoStatus.getMessage() + )); + } } return Optional.of(true); diff --git a/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml b/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml index 6df06af4..d826b73d 100644 --- a/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml +++ b/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml @@ -20,15 +20,15 @@ MSG_BODY ) VALUES - + ( - 0, + 5, TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') || '_' || #{item.householdNum}, NOW(), NOW(), #{item.phone}, - #{item.sendPhone}, - #{item.message} + #{sendPhone}, + #{message} )