From e91096e4e077cd067ba6db152d35798bac46ebd5 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Tue, 10 Jun 2025 15:31:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=B8=A0=E9=81=93=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/sms/SmsChannelController.java | 13 ++++++++-- .../system/service/sms/SmsChannelService.java | 11 ++++++-- .../service/sms/SmsChannelServiceImpl.java | 25 +++++++++++++++++++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java index cb26c7f000..0a2e701e96 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java @@ -12,11 +12,11 @@ import cn.iocoder.yudao.module.system.service.sms.SmsChannelService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; import java.util.Comparator; import java.util.List; @@ -54,6 +54,15 @@ public class SmsChannelController { return success(true); } + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号列表", required = true) + @Operation(summary = "批量删除短信渠道") + @PreAuthorize("@ss.hasPermission('system:sms-channel:delete')") + public CommonResult deleteSmsChannelList(@RequestParam("ids") List ids) { + smsChannelService.deleteSmsChannelList(ids); + return success(true); + } + @GetMapping("/get") @Operation(summary = "获得短信渠道") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java index c33c7752ce..9bb0d00fe1 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.system.service.sms; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.framework.sms.core.client.SmsClient; import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; - +import cn.iocoder.yudao.module.system.framework.sms.core.client.SmsClient; import jakarta.validation.Valid; + import java.util.List; /** @@ -39,6 +39,13 @@ public interface SmsChannelService { */ void deleteSmsChannel(Long id); + /** + * 批量删除短信渠道 + * + * @param ids 编号数组 + */ + void deleteSmsChannelList(List ids); + /** * 获得短信渠道 * diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java index 5c6f36d8f7..c16dffb59e 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.service.sms; +import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; @@ -65,6 +66,23 @@ public class SmsChannelServiceImpl implements SmsChannelService { smsChannelMapper.deleteById(id); } + @Override + public void deleteSmsChannelList(List ids) { + if (CollUtil.isEmpty(ids)) { + return; + } + // 校验存在 + validateSmsChannelBatchExists(ids); + // 校验是否有在使用该账号的模版 + for (Long id : ids) { + if (smsTemplateService.getSmsTemplateCountByChannelId(id) > 0) { + throw exception(SMS_CHANNEL_HAS_CHILDREN); + } + } + // 批量删除 + smsChannelMapper.deleteByIds(ids); + } + private SmsChannelDO validateSmsChannelExists(Long id) { SmsChannelDO channel = smsChannelMapper.selectById(id); if (channel == null) { @@ -73,6 +91,13 @@ public class SmsChannelServiceImpl implements SmsChannelService { return channel; } + private void validateSmsChannelBatchExists(List ids) { + List channels = smsChannelMapper.selectByIds(ids); + if (channels.size() != ids.size()) { + throw exception(SMS_CHANNEL_NOT_EXISTS); + } + } + @Override public SmsChannelDO getSmsChannel(Long id) { return smsChannelMapper.selectById(id);