From 0f949981448218cfdd5961c4205638bd4cccf02d Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Sun, 28 Sep 2025 10:16:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(sms):=20=E8=B0=83=E6=95=B4=E7=94=9F?=
 =?UTF-8?q?=E6=97=A5=E5=92=8C=E4=B8=BB=E9=A2=98=E6=97=A5=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将调试日志升级为信息日志以提高可见性-优化日志记录逻辑确保关键操作被正确跟踪- 统一异常处理中的日志输出格式
- 改进定时任务执行时的日志记录准确性
-修正线程安全状态检查时的日志描述
- 更新方法注释以符合实际实现逻辑
---
 .../service/impl/SmsBirthdayServiceImpl.java  | 34 +++++++++----------
 .../service/impl/SmsHolidayServiceImpl.java   |  2 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java b/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java
index 8ac8df4..4df0041 100644
--- a/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java
@@ -180,6 +180,7 @@ public class SmsBirthdayServiceImpl extends ServiceImpl<SmsBirthdayMapper, SmsBi
     public void resetFlagBirthdaySentToday() {
         specialistMapper.resetFlagBirthdaySentToday();
     }
+
     /**
      * 定时检查并发送生日短信
      * 每分钟执行一次
@@ -190,7 +191,7 @@ public class SmsBirthdayServiceImpl extends ServiceImpl<SmsBirthdayMapper, SmsBi
             // 获取生日短信配置
             SmsBirthday smsBirthday = this.getById(1L);
             if (smsBirthday == null || smsBirthday.getStatus() != 1) {
-                log.debug("生日短信功能未启用");
+                log.info("生日短信功能未启用");
                 return;
             }
 
@@ -203,7 +204,7 @@ public class SmsBirthdayServiceImpl extends ServiceImpl<SmsBirthdayMapper, SmsBi
 
             // 如果已经发送过，不再重复发送
             if (sending.get()) {
-                log.debug("其他线程正在执行生日短信发送任务");
+                log.info("其他线程正在执行生日短信发送任务");
                 return;
             }
 
@@ -224,29 +225,26 @@ public class SmsBirthdayServiceImpl extends ServiceImpl<SmsBirthdayMapper, SmsBi
                 if (now.isEqual(scheduledTime) || now.isAfter(scheduledTime)) {
                     // 原子性检查和设置发送状态
                     if (sending.compareAndSet(false, true)) {
-                        log.info("到达生日短信发送时间: {}, 开始执行发送任务", executionTime);
-
-                        // 查询今天过生日的专家
-                        List<SmsSpecialist> birthdaySpecialists = listBirthdayToday();
-
-                        if (birthdaySpecialists.isEmpty()) {
-                            log.info("今天没有专家过生日，无需发送生日短信");
-                        } else {
-                            log.info("今天有{}位专家过生日，开始发送生日短信", birthdaySpecialists.size());
-
-                            try {
+                        try {
+                            log.info("到达生日短信发送时间: {}, 开始执行发送任务", executionTime);
+                            // 查询今天过生日的专家
+                            List<SmsSpecialist> birthdaySpecialists = listBirthdayToday();
+                            if (birthdaySpecialists.isEmpty()) {
+                                log.info("今天没有专家过生日，无需发送生日短信");
+                            } else {
+                                log.info("今天有{}位专家过生日，开始发送生日短信", birthdaySpecialists.size());
                                 // 发送生日短信
                                 sendBirthdaySms(birthdaySpecialists);
-                            } finally {
-                                sending.set(false);
+                                log.info("生日短信发送任务完成");
                             }
-                            log.info("生日短信发送任务完成");
+                        } finally {
+                            sending.set(false);
                         }
                     } else {
-                        log.debug("其他线程正在执行生日短信发送任务");
+                        log.info("其他线程正在执行生日短信发送任务");
                     }
                 } else {
-                    log.debug("当前时间{}未到执行时间{}", now.format(DateTimeFormatter.ofPattern("HH:mm:ss")), executionTime);
+                    log.info("当前时间{}未到执行时间{}", now.format(DateTimeFormatter.ofPattern("HH:mm:ss")), executionTime);
                 }
 
             } catch (Exception e) {
diff --git a/src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java b/src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java
index ae21c9c..51fd064 100644
--- a/src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java
@@ -273,7 +273,7 @@ public class SmsHolidayServiceImpl extends ServiceImpl<SmsHolidayMapper, SmsHoli
             List<SmsHoliday> todayTasks = listTodayTasks();
 
             if (todayTasks.isEmpty()) {
-                log.debug("今日没有需要执行的主题日短信任务");
+                log.info("今日没有需要执行的主题日短信任务");
                 return;
             }