diff --git a/sql/tables.sms.sql b/sql/tables.sms.sql index 5f5d4cf..d48eae5 100644 --- a/sql/tables.sms.sql +++ b/sql/tables.sms.sql @@ -1,7 +1,7 @@ -- 姓名,职务,生日,称呼,电话号码,生效状态,创建日期 -- 达梦数据库SPECIALIST表建表语句 -CREATE TABLE SPECIALIST ( +CREATE TABLE SMS_SPECIALIST ( ID BIGINT IDENTITY(1,1) PRIMARY KEY, NAME VARCHAR(50) NOT NULL COMMENT '姓名', POSITION VARCHAR(100) COMMENT '职务', @@ -10,7 +10,7 @@ CREATE TABLE SPECIALIST ( PHONE VARCHAR(20) UNIQUE COMMENT '电话号码', STATUS INT DEFAULT 1 COMMENT '生效状态 1:有效 0:无效', CREATE_TM DATETIME DEFAULT CURRENT_TIME COMMENT '创建日期', - FLAG_BIRTHDAY_SENT_TODAY INT DEFAULT 0 + FLAG_BIRTHDAY_SENT_TODAY INT DEFAULT 0, FLAG_HOLIDAY_SENT_TODAY INT DEFAULT 0 ); @@ -19,7 +19,7 @@ CREATE TABLE SPECIALIST ( --2025年国庆,2025-10-01,2025-10-03,08:00:00,有效,2025-09-15 --2026年春节,2026-02-17,2026-02-17,08:00:00,有效,2025-09-15 -- 达梦数据库TASK表建表语句 -CREATE TABLE SMS_TASK ( +CREATE TABLE SMS_HOLIDAY ( ID BIGINT IDENTITY(1,1) PRIMARY KEY, SUBJECT_NAME VARCHAR(200) NOT NULL COMMENT '主题名称', START_DATE DATE COMMENT '任务开始日期', diff --git a/src/main/java/com/whdc/controller/SmsBirthdayController.java b/src/main/java/com/whdc/controller/SmsBirthdayController.java index ee2dcdc..e1b3679 100644 --- a/src/main/java/com/whdc/controller/SmsBirthdayController.java +++ b/src/main/java/com/whdc/controller/SmsBirthdayController.java @@ -21,7 +21,7 @@ import java.util.List; */ @Api(tags = "生日短信 - Controller") @RestController -@RequestMapping("/smsBirthday") +@RequestMapping("/sms/birthday") public class SmsBirthdayController { @Autowired diff --git a/src/main/java/com/whdc/controller/SmsTaskController.java b/src/main/java/com/whdc/controller/SmsHolidayController.java similarity index 77% rename from src/main/java/com/whdc/controller/SmsTaskController.java rename to src/main/java/com/whdc/controller/SmsHolidayController.java index 77c8ffc..e9811b8 100644 --- a/src/main/java/com/whdc/controller/SmsTaskController.java +++ b/src/main/java/com/whdc/controller/SmsHolidayController.java @@ -1,9 +1,9 @@ package com.whdc.controller; -import com.whdc.model.entity.SmsTask; +import com.whdc.model.entity.SmsHoliday; import com.whdc.model.group.Insert; import com.whdc.model.group.Update; -import com.whdc.service.ISmsTaskService; +import com.whdc.service.ISmsHolidayService; import com.whdc.utils.ResultJson; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,27 +21,27 @@ import java.util.List; */ @Api(tags = "短信任务 - Controller") @RestController -@RequestMapping("/smsTask") -public class SmsTaskController { +@RequestMapping("/sms/holiday") +public class SmsHolidayController { @Autowired - private ISmsTaskService smsTaskService; + private ISmsHolidayService smsTaskService; @ApiOperation(value = "分页查询") @PostMapping(value = "page") - public ResultJson> page(@RequestBody SmsTask dto) { + public ResultJson> page(@RequestBody SmsHoliday dto) { return ResultJson.ok(smsTaskService.list()); } @ApiOperation(value = "新增") @PostMapping(value = "add") - public ResultJson add(@RequestBody @Validated(Insert.class) SmsTask model) { + public ResultJson add(@RequestBody @Validated(Insert.class) SmsHoliday model) { return ResultJson.ok(smsTaskService.save(model)); } @ApiOperation(value = "修改") @PostMapping(value = "edit") - public ResultJson edit(@RequestBody @Validated(Update.class) SmsTask model) { + public ResultJson edit(@RequestBody @Validated(Update.class) SmsHoliday model) { return ResultJson.ok(smsTaskService.updateById(model)); } @@ -53,7 +53,7 @@ public class SmsTaskController { @ApiOperation(value = "根据ID查询") @GetMapping(value = "get/{id}") - public ResultJson getById(@PathVariable("id") Long id) { + public ResultJson getById(@PathVariable("id") Long id) { return ResultJson.ok(smsTaskService.getById(id)); } } \ No newline at end of file diff --git a/src/main/java/com/whdc/controller/SmsLogController.java b/src/main/java/com/whdc/controller/SmsLogController.java index 2a4081c..3d8159e 100644 --- a/src/main/java/com/whdc/controller/SmsLogController.java +++ b/src/main/java/com/whdc/controller/SmsLogController.java @@ -21,7 +21,7 @@ import java.util.List; */ @Api(tags = "短信日志 - Controller") @RestController -@RequestMapping("/smsLog") +@RequestMapping("/sms/log") public class SmsLogController { @Autowired diff --git a/src/main/java/com/whdc/controller/SpecialistController.java b/src/main/java/com/whdc/controller/SmsSpecialistController.java similarity index 77% rename from src/main/java/com/whdc/controller/SpecialistController.java rename to src/main/java/com/whdc/controller/SmsSpecialistController.java index 2f43455..411deb2 100644 --- a/src/main/java/com/whdc/controller/SpecialistController.java +++ b/src/main/java/com/whdc/controller/SmsSpecialistController.java @@ -2,10 +2,10 @@ package com.whdc.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.whdc.model.dto.FindPageDto; -import com.whdc.model.entity.Specialist; +import com.whdc.model.entity.SmsSpecialist; import com.whdc.model.group.Insert; import com.whdc.model.group.Update; -import com.whdc.service.ISpecialistService; +import com.whdc.service.ISmsSpecialistService; import com.whdc.utils.ResultJson; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,28 +21,28 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "专家通讯录 - Controller") @RestController -@RequestMapping("/specialist") -public class SpecialistController { +@RequestMapping("/sms/specialist") +public class SmsSpecialistController { @Autowired - private ISpecialistService specialistService; + private ISmsSpecialistService specialistService; @ApiOperation(value = "分页查询") @PostMapping(value = "page") - public ResultJson> page(@RequestBody FindPageDto dto) { + public ResultJson> page(@RequestBody FindPageDto dto) { return ResultJson.ok(specialistService.page(dto.getPage())); } @ApiOperation(value = "新增") @PostMapping(value = "add") - public ResultJson add(@RequestBody @Validated(Insert.class) Specialist model) { + public ResultJson add(@RequestBody @Validated(Insert.class) SmsSpecialist model) { return ResultJson.ok(specialistService.save(model)); } @ApiOperation(value = "修改") @PostMapping(value = "edit") - public ResultJson edit(@RequestBody @Validated(Update.class) Specialist model) { + public ResultJson edit(@RequestBody @Validated(Update.class) SmsSpecialist model) { return ResultJson.ok(specialistService.updateById(model)); } @@ -54,7 +54,7 @@ public class SpecialistController { @ApiOperation(value = "根据ID查询") @GetMapping(value = "get/{id}") - public ResultJson getById(@PathVariable("id") Long id) { + public ResultJson getById(@PathVariable("id") Long id) { return ResultJson.ok(specialistService.getById(id)); } } \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/SmsTaskMapper.java b/src/main/java/com/whdc/mapper/SmsHolidayMapper.java similarity index 59% rename from src/main/java/com/whdc/mapper/SmsTaskMapper.java rename to src/main/java/com/whdc/mapper/SmsHolidayMapper.java index 8e0b8fb..02b0283 100644 --- a/src/main/java/com/whdc/mapper/SmsTaskMapper.java +++ b/src/main/java/com/whdc/mapper/SmsHolidayMapper.java @@ -1,7 +1,7 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.whdc.model.entity.SmsTask; +import com.whdc.model.entity.SmsHoliday; /** * 短信任务Mapper接口 @@ -9,5 +9,5 @@ import com.whdc.model.entity.SmsTask; * @author lyf * @since 2025-09-23 */ -public interface SmsTaskMapper extends BaseMapper { +public interface SmsHolidayMapper extends BaseMapper { } \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/SpecialistMapper.java b/src/main/java/com/whdc/mapper/SmsSpecialistMapper.java similarity index 72% rename from src/main/java/com/whdc/mapper/SpecialistMapper.java rename to src/main/java/com/whdc/mapper/SmsSpecialistMapper.java index 0bea9f1..1eea13f 100644 --- a/src/main/java/com/whdc/mapper/SpecialistMapper.java +++ b/src/main/java/com/whdc/mapper/SmsSpecialistMapper.java @@ -1,7 +1,7 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.whdc.model.entity.Specialist; +import com.whdc.model.entity.SmsSpecialist; import org.apache.ibatis.annotations.Update; /** @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Update; * @author lyf * @since 2025-09-23 */ -public interface SpecialistMapper extends BaseMapper { +public interface SmsSpecialistMapper extends BaseMapper { @Update("update specialist set flag_birthday_sent_today = 0") void resetFlagBirthdaySentToday(); } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/SmsTask.java b/src/main/java/com/whdc/model/entity/SmsHoliday.java similarity index 96% rename from src/main/java/com/whdc/model/entity/SmsTask.java rename to src/main/java/com/whdc/model/entity/SmsHoliday.java index ccef43d..aa23c43 100644 --- a/src/main/java/com/whdc/model/entity/SmsTask.java +++ b/src/main/java/com/whdc/model/entity/SmsHoliday.java @@ -23,8 +23,8 @@ import java.util.Date; @EqualsAndHashCode @Accessors(chain = true) @ApiModel(description = "节日短信") -@TableName("SMS_TASK") -public class SmsTask implements Serializable { +@TableName("SMS_HOLIDAY") +public class SmsHoliday implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/whdc/model/entity/Specialist.java b/src/main/java/com/whdc/model/entity/SmsSpecialist.java similarity index 96% rename from src/main/java/com/whdc/model/entity/Specialist.java rename to src/main/java/com/whdc/model/entity/SmsSpecialist.java index 2a1fcc8..c9ff7ce 100644 --- a/src/main/java/com/whdc/model/entity/Specialist.java +++ b/src/main/java/com/whdc/model/entity/SmsSpecialist.java @@ -22,8 +22,8 @@ import java.util.Date; @EqualsAndHashCode @Accessors(chain = true) @ApiModel(description = "专家") -@TableName("SPECIALIST") -public class Specialist implements Serializable { +@TableName("SMS_SPECIALIST") +public class SmsSpecialist implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/whdc/service/ISmsBirthdayService.java b/src/main/java/com/whdc/service/ISmsBirthdayService.java index 1638493..be56e3b 100644 --- a/src/main/java/com/whdc/service/ISmsBirthdayService.java +++ b/src/main/java/com/whdc/service/ISmsBirthdayService.java @@ -2,7 +2,7 @@ package com.whdc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.whdc.model.entity.SmsBirthday; -import com.whdc.model.entity.Specialist; +import com.whdc.model.entity.SmsSpecialist; import java.util.List; @@ -16,10 +16,10 @@ public interface ISmsBirthdayService extends IService { /** * 查询今天过生日专家 */ - List listBirthdayToday(); + List listBirthdayToday(); /** * 发送生日短信 */ - void sendBirthdaySms(List specialists); + void sendBirthdaySms(List specialists); } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/ISmsTaskService.java b/src/main/java/com/whdc/service/ISmsHolidayService.java similarity index 58% rename from src/main/java/com/whdc/service/ISmsTaskService.java rename to src/main/java/com/whdc/service/ISmsHolidayService.java index f6f9357..ff61930 100644 --- a/src/main/java/com/whdc/service/ISmsTaskService.java +++ b/src/main/java/com/whdc/service/ISmsHolidayService.java @@ -1,8 +1,7 @@ package com.whdc.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.whdc.model.entity.SmsTask; -import com.whdc.model.entity.Specialist; +import com.whdc.model.entity.SmsHoliday; import java.util.List; @@ -12,24 +11,24 @@ import java.util.List; * @author lyf * @since 2025-09-23 */ -public interface ISmsTaskService extends IService { +public interface ISmsHolidayService extends IService { /** * 查询当前活动中的主题日短信任务 */ - List listActiveTasks(); + List listActiveTasks(); /** * 查询需要执行的今日主题日任务 */ - List listTodayTasks(); + List listTodayTasks(); /** * 发送主题日短信 */ - void sendThemeSms(SmsTask smsTask); + void sendThemeSms(SmsHoliday smsTask); /** * 批量发送主题日短信 */ - void sendBatchThemeSms(List smsTasks); + void sendBatchThemeSms(List smsTasks); } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/ISpecialistService.java b/src/main/java/com/whdc/service/ISmsSpecialistService.java similarity index 58% rename from src/main/java/com/whdc/service/ISpecialistService.java rename to src/main/java/com/whdc/service/ISmsSpecialistService.java index ac55a80..b7788cd 100644 --- a/src/main/java/com/whdc/service/ISpecialistService.java +++ b/src/main/java/com/whdc/service/ISmsSpecialistService.java @@ -1,7 +1,7 @@ package com.whdc.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.whdc.model.entity.Specialist; +import com.whdc.model.entity.SmsSpecialist; /** * 专家通讯录服务接口 @@ -9,5 +9,5 @@ import com.whdc.model.entity.Specialist; * @author lyf * @since 2025-09-23 */ -public interface ISpecialistService extends IService { +public interface ISmsSpecialistService extends IService { } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java b/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java index 121782a..8ac8df4 100644 --- a/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java @@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.SmsBirthdayMapper; import com.whdc.mapper.SmsLogMapper; -import com.whdc.mapper.SpecialistMapper; +import com.whdc.mapper.SmsSpecialistMapper; import com.whdc.model.entity.SmsBirthday; import com.whdc.model.entity.SmsLog; -import com.whdc.model.entity.Specialist; +import com.whdc.model.entity.SmsSpecialist; import com.whdc.service.ISmsBirthdayService; import com.whdc.utils.SmsHelper; import lombok.extern.slf4j.Slf4j; @@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public class SmsBirthdayServiceImpl extends ServiceImpl implements ISmsBirthdayService { @Autowired - private SpecialistMapper specialistMapper; + private SmsSpecialistMapper specialistMapper; @Autowired private SmsLogMapper smsLogMapper; @@ -44,20 +44,20 @@ public class SmsBirthdayServiceImpl extends ServiceImpl listBirthdayToday() { + public List listBirthdayToday() { try { // 获取当前日期的月和日 LocalDate today = LocalDate.now(); String monthDay = today.format(DateTimeFormatter.ofPattern("MM-dd")); // 查询今天过生日的专家(状态为有效的) - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper .apply("DATE_FORMAT(BIRTHDAY, '%m-%d') = {0}", monthDay) - .eq(Specialist::getFlagBirthdaySentToday, 0) - .eq(Specialist::getStatus, 1); // 1:有效 + .eq(SmsSpecialist::getFlagBirthdaySentToday, 0) + .eq(SmsSpecialist::getStatus, 1); // 1:有效 - List specialists = specialistMapper.selectList(queryWrapper); + List specialists = specialistMapper.selectList(queryWrapper); return specialists != null ? specialists : Collections.emptyList(); } catch (Exception e) { // 记录异常并返回空列表 @@ -66,7 +66,7 @@ public class SmsBirthdayServiceImpl extends ServiceImpl specialists) { + public void sendBirthdaySms(List specialists) { if (specialists == null || specialists.isEmpty()) { log.info("没有需要发送生日短信的专家"); return; @@ -92,7 +92,7 @@ public class SmsBirthdayServiceImpl extends ServiceImpl distinct = new HashSet<>(); for (int i = 0; i < specialists.size(); i++) { - Specialist specialist = specialists.get(i); + SmsSpecialist specialist = specialists.get(i); if (distinct.contains(specialist.getPhone())) { continue; } @@ -227,7 +227,7 @@ public class SmsBirthdayServiceImpl extends ServiceImpl birthdaySpecialists = listBirthdayToday(); + List birthdaySpecialists = listBirthdayToday(); if (birthdaySpecialists.isEmpty()) { log.info("今天没有专家过生日,无需发送生日短信"); diff --git a/src/main/java/com/whdc/service/impl/SmsTaskServiceImpl.java b/src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java similarity index 85% rename from src/main/java/com/whdc/service/impl/SmsTaskServiceImpl.java rename to src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java index 5a50357..a3b7f30 100644 --- a/src/main/java/com/whdc/service/impl/SmsTaskServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java @@ -3,12 +3,12 @@ package com.whdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.SmsLogMapper; -import com.whdc.mapper.SmsTaskMapper; -import com.whdc.mapper.SpecialistMapper; +import com.whdc.mapper.SmsHolidayMapper; +import com.whdc.mapper.SmsSpecialistMapper; import com.whdc.model.entity.SmsLog; -import com.whdc.model.entity.SmsTask; -import com.whdc.model.entity.Specialist; -import com.whdc.service.ISmsTaskService; +import com.whdc.model.entity.SmsHoliday; +import com.whdc.model.entity.SmsSpecialist; +import com.whdc.service.ISmsHolidayService; import com.whdc.utils.SmsHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -32,10 +32,10 @@ import java.util.concurrent.atomic.AtomicBoolean; */ @Service @Slf4j -public class SmsTaskServiceImpl extends ServiceImpl implements ISmsTaskService { +public class SmsHolidayServiceImpl extends ServiceImpl implements ISmsHolidayService { @Autowired - private SpecialistMapper specialistMapper; + private SmsSpecialistMapper specialistMapper; @Autowired private SmsLogMapper smsLogMapper; @@ -47,18 +47,18 @@ public class SmsTaskServiceImpl extends ServiceImpl impl private final Map taskSmsSentToday = new ConcurrentHashMap<>(); @Override - public List listActiveTasks() { + public List listActiveTasks() { try { LocalDate today = LocalDate.now(); // 查询当前活动中的主题日短信任务 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .eq(SmsTask::getStatus, 1) // 1:有效 - .le(SmsTask::getStartDate, today) // 开始日期小于等于今天 - .ge(SmsTask::getEndDate, today); // 结束日期大于等于今天 + .eq(SmsHoliday::getStatus, 1) // 1:有效 + .le(SmsHoliday::getStartDate, today) // 开始日期小于等于今天 + .ge(SmsHoliday::getEndDate, today); // 结束日期大于等于今天 - List tasks = this.list(queryWrapper); + List tasks = this.list(queryWrapper); return tasks != null ? tasks : Collections.emptyList(); } catch (Exception e) { log.error("查询活动中的主题日短信任务失败: {}", e.getMessage(), e); @@ -67,19 +67,19 @@ public class SmsTaskServiceImpl extends ServiceImpl impl } @Override - public List listTodayTasks() { + public List listTodayTasks() { try { // 获取当前活动中的任务 - List activeTasks = listActiveTasks(); + List activeTasks = listActiveTasks(); if (activeTasks.isEmpty()) { return Collections.emptyList(); } LocalDate today = LocalDate.now(); - List todayTasks = new java.util.ArrayList<>(); + List todayTasks = new java.util.ArrayList<>(); // 筛选今天需要执行的任务 - for (SmsTask task : activeTasks) { + for (SmsHoliday task : activeTasks) { // 检查是否已经发送过 AtomicBoolean sentFlag = taskSmsSentToday.computeIfAbsent(task.getId(), k -> new AtomicBoolean(false)); if (sentFlag.get()) { @@ -118,14 +118,14 @@ public class SmsTaskServiceImpl extends ServiceImpl impl } @Override - public void sendThemeSms(SmsTask smsTask) { + public void sendThemeSms(SmsHoliday smsTask) { if (smsTask == null) { log.warn("主题日短信任务为空"); return; } // 获取所有有效专家 - List specialists = getValidSpecialists(); + List specialists = getValidSpecialists(); if (specialists.isEmpty()) { log.info("没有有效专家,跳过主题日短信发送"); return; @@ -142,7 +142,7 @@ public class SmsTaskServiceImpl extends ServiceImpl impl log.info("开始向{}位专家发送主题日短信[{}]", totalSpecialists, smsTask.getSubjectName()); for (int i = 0; i < specialists.size(); i++) { - Specialist specialist = specialists.get(i); + SmsSpecialist specialist = specialists.get(i); // 替换模板中的占位符 String content = template.replace("{姓名}", specialist.getName()) .replace("{主题}", smsTask.getSubjectName()); @@ -211,14 +211,14 @@ public class SmsTaskServiceImpl extends ServiceImpl impl } @Override - public void sendBatchThemeSms(List smsTasks) { + public void sendBatchThemeSms(List smsTasks) { if (smsTasks == null || smsTasks.isEmpty()) { log.info("没有需要发送的主题日短信任务"); return; } log.info("开始批量发送{}个主题日短信任务", smsTasks.size()); - for (SmsTask task : smsTasks) { + for (SmsHoliday task : smsTasks) { try { sendThemeSms(task); } catch (Exception e) { @@ -231,13 +231,13 @@ public class SmsTaskServiceImpl extends ServiceImpl impl /** * 获取所有有效专家 */ - private List getValidSpecialists() { + private List getValidSpecialists() { try { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Specialist::getStatus, 1); // 1:有效 - queryWrapper.isNotNull(Specialist::getPhone); // 手机号不为空 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SmsSpecialist::getStatus, 1); // 1:有效 + queryWrapper.isNotNull(SmsSpecialist::getPhone); // 手机号不为空 - List specialists = specialistMapper.selectList(queryWrapper); + List specialists = specialistMapper.selectList(queryWrapper); return specialists != null ? specialists : Collections.emptyList(); } catch (Exception e) { log.error("查询有效专家失败: {}", e.getMessage(), e); @@ -253,7 +253,7 @@ public class SmsTaskServiceImpl extends ServiceImpl impl public void checkAndSendThemeSms() { try { // 查询今日需要执行的主题日任务 - List todayTasks = listTodayTasks(); + List todayTasks = listTodayTasks(); if (todayTasks.isEmpty()) { log.debug("今日没有需要执行的主题日短信任务"); diff --git a/src/main/java/com/whdc/service/impl/SmsSpecialistServiceImpl.java b/src/main/java/com/whdc/service/impl/SmsSpecialistServiceImpl.java new file mode 100644 index 0000000..b20855b --- /dev/null +++ b/src/main/java/com/whdc/service/impl/SmsSpecialistServiceImpl.java @@ -0,0 +1,17 @@ +package com.whdc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.whdc.mapper.SmsSpecialistMapper; +import com.whdc.model.entity.SmsSpecialist; +import com.whdc.service.ISmsSpecialistService; +import org.springframework.stereotype.Service; + +/** + * 专家通讯录服务实现类 + * + * @author lyf + * @since 2025-09-23 + */ +@Service +public class SmsSpecialistServiceImpl extends ServiceImpl implements ISmsSpecialistService { +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/impl/SpecialistServiceImpl.java b/src/main/java/com/whdc/service/impl/SpecialistServiceImpl.java deleted file mode 100644 index 1250b55..0000000 --- a/src/main/java/com/whdc/service/impl/SpecialistServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.whdc.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.whdc.mapper.SpecialistMapper; -import com.whdc.model.entity.Specialist; -import com.whdc.service.ISpecialistService; -import org.springframework.stereotype.Service; - -/** - * 专家通讯录服务实现类 - * - * @author lyf - * @since 2025-09-23 - */ -@Service -public class SpecialistServiceImpl extends ServiceImpl implements ISpecialistService { -} \ No newline at end of file diff --git a/src/test/java/com/whdc/service/impl/BirthdaySmsServiceTest.java b/src/test/java/com/whdc/service/impl/BirthdaySmsServiceTest.java index 627bcc2..bce2ac9 100644 --- a/src/test/java/com/whdc/service/impl/BirthdaySmsServiceTest.java +++ b/src/test/java/com/whdc/service/impl/BirthdaySmsServiceTest.java @@ -1,10 +1,8 @@ package com.whdc.service.impl; -import com.whdc.model.entity.Specialist; +import com.whdc.model.entity.SmsSpecialist; import com.whdc.utils.SmsHelper; -import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import java.util.Arrays; @@ -29,13 +27,13 @@ public class BirthdaySmsServiceTest { System.out.println("=== 开始测试生日短信发送功能 ==="); // 创建测试专家数据 - Specialist specialist = new Specialist(); + SmsSpecialist specialist = new SmsSpecialist(); specialist.setName("唐威"); // specialist.setPhone("18154318312"); specialist.setPhone("15671545233"); specialist.setStatus(1); - List specialists = Arrays.asList(specialist); + List specialists = Arrays.asList(specialist); System.out.println("专家信息:"); System.out.println("姓名:" + specialist.getName()); @@ -61,10 +59,10 @@ public class BirthdaySmsServiceTest { /** * 使用指定模板测试发送短信 */ - private void testSendWithTemplate(List specialists, String template) { + private void testSendWithTemplate(List specialists, String template) { System.out.println("开始使用模板发送短信..."); - for (Specialist specialist : specialists) { + for (SmsSpecialist specialist : specialists) { try { // 替换模板中的占位符 String content = template.replace("{姓名}", specialist.getName());