From c33a615fbe6f9236ad0f2821ff249b4923ba3e16 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Fri, 26 Sep 2025 17:35:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BASMS=E7=9B=B8=E5=85=B3=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E6=B7=BB=E5=8A=A0=E4=B8=93=E9=97=A8=E7=9A=84?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2DTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增SmsSpecialistPageDto、SmsHolidayPageDto、SmsLogPageDto - 修改三个控制器的page方法使用专门的DTO - 为Service接口和实现类添加page方法支持 - 支持按name、phone、status等字段进行条件查询 - 移除不必要的searchCount、sortField、sortOrder属性 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .../whdc/controller/SmsHolidayController.java | 6 ++-- .../com/whdc/controller/SmsLogController.java | 6 ++-- .../controller/SmsSpecialistController.java | 6 ++-- .../com/whdc/model/dto/SmsHolidayPageDto.java | 28 +++++++++++++++ .../com/whdc/model/dto/SmsLogPageDto.java | 31 +++++++++++++++++ .../whdc/model/dto/SmsSpecialistPageDto.java | 34 +++++++++++++++++++ .../com/whdc/service/ISmsHolidayService.java | 4 +++ .../java/com/whdc/service/ISmsLogService.java | 4 +++ .../whdc/service/ISmsSpecialistService.java | 4 +++ .../service/impl/SmsHolidayServiceImpl.java | 17 ++++++++++ .../whdc/service/impl/SmsLogServiceImpl.java | 21 ++++++++++++ .../impl/SmsSpecialistServiceImpl.java | 24 +++++++++++++ 12 files changed, 176 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/whdc/model/dto/SmsHolidayPageDto.java create mode 100644 src/main/java/com/whdc/model/dto/SmsLogPageDto.java create mode 100644 src/main/java/com/whdc/model/dto/SmsSpecialistPageDto.java diff --git a/src/main/java/com/whdc/controller/SmsHolidayController.java b/src/main/java/com/whdc/controller/SmsHolidayController.java index 81e39dc..bbdcf81 100644 --- a/src/main/java/com/whdc/controller/SmsHolidayController.java +++ b/src/main/java/com/whdc/controller/SmsHolidayController.java @@ -1,7 +1,7 @@ package com.whdc.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.whdc.model.dto.FindPageDto; +import com.whdc.model.dto.SmsHolidayPageDto; import com.whdc.model.entity.SmsHoliday; import com.whdc.model.group.Insert; import com.whdc.model.group.Update; @@ -31,8 +31,8 @@ public class SmsHolidayController { @ApiOperation(value = "分页查询") @PostMapping(value = "page") - public ResultJson> page(@RequestBody FindPageDto dto) { - return ResultJson.ok(smsTaskService.page(dto.getPage())); + public ResultJson> page(@RequestBody SmsHolidayPageDto dto) { + return ResultJson.ok(smsTaskService.page(dto)); } @ApiOperation(value = "新增") diff --git a/src/main/java/com/whdc/controller/SmsLogController.java b/src/main/java/com/whdc/controller/SmsLogController.java index c558350..eb2db90 100644 --- a/src/main/java/com/whdc/controller/SmsLogController.java +++ b/src/main/java/com/whdc/controller/SmsLogController.java @@ -1,7 +1,7 @@ package com.whdc.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.whdc.model.dto.FindPageDto; +import com.whdc.model.dto.SmsLogPageDto; import com.whdc.model.entity.SmsLog; import com.whdc.model.group.Insert; import com.whdc.model.group.Update; @@ -31,8 +31,8 @@ public class SmsLogController { @ApiOperation(value = "分页查询") @PostMapping(value = "page") - public ResultJson> page(@RequestBody FindPageDto dto) { - return ResultJson.ok(smsLogService.page(dto.getPage())); + public ResultJson> page(@RequestBody SmsLogPageDto dto) { + return ResultJson.ok(smsLogService.page(dto)); } @ApiOperation(value = "新增") diff --git a/src/main/java/com/whdc/controller/SmsSpecialistController.java b/src/main/java/com/whdc/controller/SmsSpecialistController.java index 411deb2..795c521 100644 --- a/src/main/java/com/whdc/controller/SmsSpecialistController.java +++ b/src/main/java/com/whdc/controller/SmsSpecialistController.java @@ -1,7 +1,7 @@ package com.whdc.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.whdc.model.dto.FindPageDto; +import com.whdc.model.dto.SmsSpecialistPageDto; import com.whdc.model.entity.SmsSpecialist; import com.whdc.model.group.Insert; import com.whdc.model.group.Update; @@ -30,8 +30,8 @@ public class SmsSpecialistController { @ApiOperation(value = "分页查询") @PostMapping(value = "page") - public ResultJson> page(@RequestBody FindPageDto dto) { - return ResultJson.ok(specialistService.page(dto.getPage())); + public ResultJson> page(@RequestBody SmsSpecialistPageDto dto) { + return ResultJson.ok(specialistService.page(dto)); } @ApiOperation(value = "新增") diff --git a/src/main/java/com/whdc/model/dto/SmsHolidayPageDto.java b/src/main/java/com/whdc/model/dto/SmsHolidayPageDto.java new file mode 100644 index 0000000..d60df4b --- /dev/null +++ b/src/main/java/com/whdc/model/dto/SmsHolidayPageDto.java @@ -0,0 +1,28 @@ +package com.whdc.model.dto; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 节日短信分页查询DTO + * + * @author lyf + * @since 2025-09-26 + */ +@Data +public class SmsHolidayPageDto { + + @ApiModelProperty(value = "当前页", example = "1") + private Integer pageNumber = 1; + + @ApiModelProperty(value = "每页条数", example = "10") + private Integer pageSize = 10; + + @ApiModelProperty(value = "主题名称") + private String subjectName; + + public Page getPage() { + return new Page(pageNumber, pageSize); + } +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/dto/SmsLogPageDto.java b/src/main/java/com/whdc/model/dto/SmsLogPageDto.java new file mode 100644 index 0000000..ebc3492 --- /dev/null +++ b/src/main/java/com/whdc/model/dto/SmsLogPageDto.java @@ -0,0 +1,31 @@ +package com.whdc.model.dto; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 短信日志分页查询DTO + * + * @author lyf + * @since 2025-09-26 + */ +@Data +public class SmsLogPageDto { + + @ApiModelProperty(value = "当前页", example = "1") + private Integer pageNumber = 1; + + @ApiModelProperty(value = "每页条数", example = "10") + private Integer pageSize = 10; + + @ApiModelProperty(value = "姓名") + private String name; + + @ApiModelProperty(value = "电话号码") + private String phone; + + public Page getPage() { + return new Page(pageNumber, pageSize); + } +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/dto/SmsSpecialistPageDto.java b/src/main/java/com/whdc/model/dto/SmsSpecialistPageDto.java new file mode 100644 index 0000000..d2888d6 --- /dev/null +++ b/src/main/java/com/whdc/model/dto/SmsSpecialistPageDto.java @@ -0,0 +1,34 @@ +package com.whdc.model.dto; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 专家通讯录分页查询DTO + * + * @author lyf + * @since 2025-09-26 + */ +@Data +public class SmsSpecialistPageDto { + + @ApiModelProperty(value = "当前页", example = "1") + private Integer pageNumber = 1; + + @ApiModelProperty(value = "每页条数", example = "10") + private Integer pageSize = 10; + + @ApiModelProperty(value = "姓名") + private String name; + + @ApiModelProperty(value = "电话号码") + private String phone; + + @ApiModelProperty(value = "状态 1:有效 0:无效") + private Integer status; + + public Page getPage() { + return new Page(pageNumber, pageSize); + } +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/ISmsHolidayService.java b/src/main/java/com/whdc/service/ISmsHolidayService.java index ff61930..94fd184 100644 --- a/src/main/java/com/whdc/service/ISmsHolidayService.java +++ b/src/main/java/com/whdc/service/ISmsHolidayService.java @@ -1,6 +1,8 @@ package com.whdc.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.dto.SmsHolidayPageDto; import com.whdc.model.entity.SmsHoliday; import java.util.List; @@ -12,6 +14,8 @@ import java.util.List; * @since 2025-09-23 */ public interface ISmsHolidayService extends IService { + + Page page(SmsHolidayPageDto dto); /** * 查询当前活动中的主题日短信任务 */ diff --git a/src/main/java/com/whdc/service/ISmsLogService.java b/src/main/java/com/whdc/service/ISmsLogService.java index 8bfe2a8..96d9832 100644 --- a/src/main/java/com/whdc/service/ISmsLogService.java +++ b/src/main/java/com/whdc/service/ISmsLogService.java @@ -1,6 +1,8 @@ package com.whdc.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.dto.SmsLogPageDto; import com.whdc.model.entity.SmsLog; /** @@ -10,4 +12,6 @@ import com.whdc.model.entity.SmsLog; * @since 2025-09-23 */ public interface ISmsLogService extends IService { + + Page page(SmsLogPageDto dto); } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/ISmsSpecialistService.java b/src/main/java/com/whdc/service/ISmsSpecialistService.java index b7788cd..23a7c0a 100644 --- a/src/main/java/com/whdc/service/ISmsSpecialistService.java +++ b/src/main/java/com/whdc/service/ISmsSpecialistService.java @@ -1,6 +1,8 @@ package com.whdc.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.dto.SmsSpecialistPageDto; import com.whdc.model.entity.SmsSpecialist; /** @@ -10,4 +12,6 @@ import com.whdc.model.entity.SmsSpecialist; * @since 2025-09-23 */ public interface ISmsSpecialistService extends IService { + + Page page(SmsSpecialistPageDto dto); } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java b/src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java index a3b7f30..ae21c9c 100644 --- a/src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java @@ -1,10 +1,12 @@ package com.whdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.SmsLogMapper; import com.whdc.mapper.SmsHolidayMapper; import com.whdc.mapper.SmsSpecialistMapper; +import com.whdc.model.dto.SmsHolidayPageDto; import com.whdc.model.entity.SmsLog; import com.whdc.model.entity.SmsHoliday; import com.whdc.model.entity.SmsSpecialist; @@ -14,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.time.LocalDate; import java.time.LocalDateTime; @@ -34,6 +37,20 @@ import java.util.concurrent.atomic.AtomicBoolean; @Slf4j public class SmsHolidayServiceImpl extends ServiceImpl implements ISmsHolidayService { + public Page page(SmsHolidayPageDto dto) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + // 添加查询条件 + if (StringUtils.hasText(dto.getSubjectName())) { + queryWrapper.like(SmsHoliday::getSubjectName, dto.getSubjectName()); + } + + // 默认按创建时间降序排列 + queryWrapper.orderByDesc(SmsHoliday::getCreateTm); + + return page(dto.getPage(), queryWrapper); + } + @Autowired private SmsSpecialistMapper specialistMapper; diff --git a/src/main/java/com/whdc/service/impl/SmsLogServiceImpl.java b/src/main/java/com/whdc/service/impl/SmsLogServiceImpl.java index 239ce0e..05308c1 100644 --- a/src/main/java/com/whdc/service/impl/SmsLogServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/SmsLogServiceImpl.java @@ -1,10 +1,14 @@ package com.whdc.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.SmsLogMapper; +import com.whdc.model.dto.SmsLogPageDto; import com.whdc.model.entity.SmsLog; import com.whdc.service.ISmsLogService; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; /** * 短信日志服务实现类 @@ -14,4 +18,21 @@ import org.springframework.stereotype.Service; */ @Service public class SmsLogServiceImpl extends ServiceImpl implements ISmsLogService { + + public Page page(SmsLogPageDto dto) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + // 添加查询条件 + if (StringUtils.hasText(dto.getName())) { + queryWrapper.like(SmsLog::getName, dto.getName()); + } + if (StringUtils.hasText(dto.getPhone())) { + queryWrapper.like(SmsLog::getPhone, dto.getPhone()); + } + + // 默认按发送时间降序排列 + queryWrapper.orderByDesc(SmsLog::getSendTm); + + return page(dto.getPage(), queryWrapper); + } } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/impl/SmsSpecialistServiceImpl.java b/src/main/java/com/whdc/service/impl/SmsSpecialistServiceImpl.java index b20855b..261094c 100644 --- a/src/main/java/com/whdc/service/impl/SmsSpecialistServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/SmsSpecialistServiceImpl.java @@ -1,10 +1,14 @@ package com.whdc.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.SmsSpecialistMapper; +import com.whdc.model.dto.SmsSpecialistPageDto; import com.whdc.model.entity.SmsSpecialist; import com.whdc.service.ISmsSpecialistService; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; /** * 专家通讯录服务实现类 @@ -14,4 +18,24 @@ import org.springframework.stereotype.Service; */ @Service public class SmsSpecialistServiceImpl extends ServiceImpl implements ISmsSpecialistService { + + public Page page(SmsSpecialistPageDto dto) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + // 添加查询条件 + if (StringUtils.hasText(dto.getName())) { + queryWrapper.like(SmsSpecialist::getName, dto.getName()); + } + if (StringUtils.hasText(dto.getPhone())) { + queryWrapper.like(SmsSpecialist::getPhone, dto.getPhone()); + } + if (dto.getStatus() != null) { + queryWrapper.eq(SmsSpecialist::getStatus, dto.getStatus()); + } + + // 默认按创建时间降序排列 + queryWrapper.orderByDesc(SmsSpecialist::getCreateTm); + + return page(dto.getPage(), queryWrapper); + } } \ No newline at end of file