Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

# Conflicts: # yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/FlowableUtils.java # yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/local/LocalFileClientTest.java # yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java # yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl # yudao-module-infra/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/config/IotAlertConfigRespVO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/config/IotAlertConfigSaveReqVO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/vo/recrod/IotAlertRecordPageReqVO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/alert/IotAlertConfigDO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertRecordMapper.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/alert/IotAlertConfigServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertTriggerSceneRuleAction.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotCurrentTimeConditionMatcher.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcher.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcher.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceEventPostTriggerMatcher.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDevicePropertyPostTriggerMatcher.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcher.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcher.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelService.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImplTest.java # yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleTimerConditionIntegrationTest.java # yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertTriggerSceneRuleActionTest.java # yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusAutoConfiguration.java # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/modbus/tcpserver/IotModbusTcpServerProtocol.java # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/modbus/tcpserver/manager/IotModbusTcpServerConfigCacheService.java # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/modbus/tcpserver/manager/IotModbusTcpServerConnectionManager.java # yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java # yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java # yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImplTest.java # yudao-module-mall/yudao-module-promotion/src/test/resources/sql/clean.sql # yudao-module-mall/yudao-module-promotion/src/test/resources/sql/create_tables.sql # yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java # yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java # yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml # yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java # yudao-module-mall/yudao-module-trade/src/test/resources/sql/create_tables.sql # yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java # yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java # yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java # yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java # yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java # yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java # yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java # yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java # yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java # yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java # yudao-module-member/src/test/resources/sql/create_tables.sql # yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java # yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/config/MesProAndonConfigRespVO.java # yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defectrecord/MesQcDefectRecordController.java # yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defectrecord/MesQcDefectRecordService.java # yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defectrecord/MesQcDefectRecordServiceImpl.java # yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java
2026-10-06 14:13:14 +08:00 · 2026-05-31 21:38:31 +08:00
parent 175b956402 93746ff2e1
commit 89ec3bd5cb
240 changed files with 19965 additions and 85 deletions
@@ -1,6 +1,11 @@
 package cn.iocoder.yudao.module.system.api.permission;

+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.module.system.api.permission.dto.RoleRespDTO;
+
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;

 /**
 * 角色 API 接口
@@ -18,4 +23,31 @@ public interface RoleApi {
     */
    void validRoleList(Collection<Long> ids);

+    /**
+     * 获得角色信息
+     *
+     * @param id 角色编号
+     * @return 角色信息
+     */
+    RoleRespDTO getRole(Long id);
+
+    /**
+     * 获得角色信息数组
+     *
+     * @param ids 角色编号数组
+     * @return 角色信息数组
+     */
+    List<RoleRespDTO> getRoleList(Collection<Long> ids);
+
+    /**
+     * 获得指定编号的角色 Map
+     *
+     * @param ids 角色编号数组
+     * @return 角色 Map
+     */
+    default Map<Long, RoleRespDTO> getRoleMap(Collection<Long> ids) {
+        List<RoleRespDTO> list = getRoleList(ids);
+        return CollectionUtils.convertMap(list, RoleRespDTO::getId);
+    }
+
 }
@@ -1,10 +1,14 @@
 package cn.iocoder.yudao.module.system.api.permission;

+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.system.api.permission.dto.RoleRespDTO;
+import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
 import cn.iocoder.yudao.module.system.service.permission.RoleService;
 import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.List;

 /**
 * 角色 API 实现类
@@ -21,4 +25,16 @@ public class RoleApiImpl implements RoleApi {
    public void validRoleList(Collection<Long> ids) {
        roleService.validateRoleList(ids);
    }
+
+    @Override
+    public RoleRespDTO getRole(Long id) {
+        RoleDO role = roleService.getRole(id);
+        return BeanUtils.toBean(role, RoleRespDTO.class);
+    }
+
+    @Override
+    public List<RoleRespDTO> getRoleList(Collection<Long> ids) {
+        List<RoleDO> list = roleService.getRoleList(ids);
+        return BeanUtils.toBean(list, RoleRespDTO.class);
+    }
 }
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.system.api.permission.dto;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import lombok.Data;
+
+/**
+ * 角色 Response DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class RoleRespDTO {
+
+    /**
+     * 角色编号
+     */
+    private Long id;
+    /**
+     * 角色名称
+     */
+    private String name;
+    /**
+     * 角色编码
+     */
+    private String code;
+    /**
+     * 显示顺序
+     */
+    private Integer sort;
+    /**
+     * 角色状态
+     *
+     * 枚举 {@link CommonStatusEnum}
+     */
+    private Integer status;
+
+}
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail;

+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -80,10 +81,11 @@ public class MailTemplateController {
        return success(BeanUtils.toBean(pageResult, MailTemplateRespVO.class));
    }

-    @GetMapping({"/list-all-simple", "simple-list"})
-    @Operation(summary = "获得邮件模版精简列表")
-    public CommonResult<List<MailTemplateSimpleRespVO>> getSimpleTemplateList() {
-        List<MailTemplateDO> list = mailTempleService.getMailTemplateList();
+    @GetMapping({"/list-all-simple", "/simple-list"})
+    @Operation(summary = "获得邮件模版精简列表", description = "只包含被开启的邮件模版，主要用于前端的下拉选项")
+    public CommonResult<List<MailTemplateSimpleRespVO>> getSimpleMailTemplateList() {
+        List<MailTemplateDO> list = mailTempleService.getMailTemplateListByStatus(
+                CommonStatusEnum.ENABLE.getStatus());
        return success(BeanUtils.toBean(list, MailTemplateSimpleRespVO.class));
    }

@@ -13,4 +13,7 @@ public class MailTemplateSimpleRespVO {
    @Schema(description = "模版名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "哒哒哒")
    private String name;

+    @Schema(description = "模版编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "mail_001")
+    private String code;
+
 }
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify;

+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -8,6 +9,7 @@ import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.Notify
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateSaveReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateSendReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateSimpleRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
 import cn.iocoder.yudao.module.system.service.notify.NotifySendService;
 import cn.iocoder.yudao.module.system.service.notify.NotifyTemplateService;
@@ -86,6 +88,14 @@ public class NotifyTemplateController {
        return success(BeanUtils.toBean(pageResult, NotifyTemplateRespVO.class));
    }

+    @GetMapping({"/list-all-simple", "/simple-list"})
+    @Operation(summary = "获得站内信模版精简列表", description = "只包含被开启的站内信模版，主要用于前端的下拉选项")
+    public CommonResult<List<NotifyTemplateSimpleRespVO>> getSimpleNotifyTemplateList() {
+        List<NotifyTemplateDO> list = notifyTemplateService.getNotifyTemplateListByStatus(
+                CommonStatusEnum.ENABLE.getStatus());
+        return success(BeanUtils.toBean(list, NotifyTemplateSimpleRespVO.class));
+    }
+
    @PostMapping("/send-notify")
    @Operation(summary = "发送站内信")
    @PreAuthorize("@ss.hasPermission('system:notify-template:send-notify')")
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 站内信模版的精简 Response VO")
+@Data
+public class NotifyTemplateSimpleRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
+    @Schema(description = "模版名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "系统通知")
+    private String name;
+
+    @Schema(description = "模版编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "notify_001")
+    private String code;
+
+}
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.sms;

 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -10,6 +11,7 @@ import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTempla
 import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateSaveReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateSendReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateSimpleRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import cn.iocoder.yudao.module.system.service.sms.SmsSendService;
 import cn.iocoder.yudao.module.system.service.sms.SmsTemplateService;
@@ -88,6 +90,14 @@ public class SmsTemplateController {
        return success(BeanUtils.toBean(pageResult, SmsTemplateRespVO.class));
    }

+    @GetMapping({"/list-all-simple", "/simple-list"})
+    @Operation(summary = "获得短信模板精简列表", description = "只包含被开启的短信模板，主要用于前端的下拉选项")
+    public CommonResult<List<SmsTemplateSimpleRespVO>> getSimpleSmsTemplateList() {
+        List<SmsTemplateDO> list = smsTemplateService.getSmsTemplateListByStatus(
+                CommonStatusEnum.ENABLE.getStatus());
+        return success(BeanUtils.toBean(list, SmsTemplateSimpleRespVO.class));
+    }
+
    @GetMapping("/export-excel")
    @Operation(summary = "导出短信模板 Excel")
    @PreAuthorize("@ss.hasPermission('system:sms-template:export')")
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.controller.admin.sms.vo.template;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 短信模板的精简 Response VO")
+@Data
+public class SmsTemplateSimpleRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
+    @Schema(description = "模板名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "验证码")
+    private String name;
+
+    @Schema(description = "模板编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "sms_001")
+    private String code;
+
+}
@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemp
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import org.apache.ibatis.annotations.Mapper;

+import java.util.List;
+
@Mapper
 public interface MailTemplateMapper extends BaseMapperX<MailTemplateDO> {

@@ -28,4 +30,8 @@ public interface MailTemplateMapper extends BaseMapperX<MailTemplateDO> {
        return selectOne(MailTemplateDO::getCode, code);
    }

+    default List<MailTemplateDO> selectListByStatus(Integer status) {
+        return selectList(MailTemplateDO::getStatus, status);
+    }
+
 }
@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.Notify
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
 import org.apache.ibatis.annotations.Mapper;

+import java.util.List;
+
@Mapper
 public interface NotifyTemplateMapper extends BaseMapperX<NotifyTemplateDO> {

@@ -23,4 +25,8 @@ public interface NotifyTemplateMapper extends BaseMapperX<NotifyTemplateDO> {
                .orderByDesc(NotifyTemplateDO::getId));
    }

+    default List<NotifyTemplateDO> selectListByStatus(Integer status) {
+        return selectList(NotifyTemplateDO::getStatus, status);
+    }
+
 }
@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTempla
 import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import org.apache.ibatis.annotations.Mapper;

+import java.util.List;
+
@Mapper
 public interface SmsTemplateMapper extends BaseMapperX<SmsTemplateDO> {

@@ -30,4 +32,8 @@ public interface SmsTemplateMapper extends BaseMapperX<SmsTemplateDO> {
        return selectCount(SmsTemplateDO::getChannelId, channelId);
    }

+    default List<SmsTemplateDO> selectListByStatus(Integer status) {
+        return selectList(SmsTemplateDO::getStatus, status);
+    }
+
 }
@@ -69,6 +69,14 @@ public interface MailTemplateService {
     */
    List<MailTemplateDO> getMailTemplateList();

+    /**
+     * 获取指定状态的邮件模版数组
+     *
+     * @param status 状态
+     * @return 邮件模版数组
+     */
+    List<MailTemplateDO> getMailTemplateListByStatus(Integer status);
+
    /**
     * 从缓存中获取邮件模版
     *
@@ -113,7 +113,9 @@ public class MailTemplateServiceImpl implements MailTemplateService {
    }

    @Override
-    public MailTemplateDO getMailTemplate(Long id) {return mailTemplateMapper.selectById(id);}
+    public MailTemplateDO getMailTemplate(Long id) {
+        return mailTemplateMapper.selectById(id);
+    }

    @Override
    @Cacheable(value = RedisKeyConstants.MAIL_TEMPLATE, key = "#code", unless = "#result == null")
@@ -127,7 +129,14 @@ public class MailTemplateServiceImpl implements MailTemplateService {
    }

    @Override
-    public List<MailTemplateDO> getMailTemplateList() {return mailTemplateMapper.selectList();}
+    public List<MailTemplateDO> getMailTemplateList() {
+        return mailTemplateMapper.selectList();
+    }
+
+    @Override
+    public List<MailTemplateDO> getMailTemplateListByStatus(Integer status) {
+        return mailTemplateMapper.selectListByStatus(status);
+    }

    @Override
    public String formatMailTemplateContent(String content, Map<String, Object> params) {
@@ -236,4 +245,4 @@ public class MailTemplateServiceImpl implements MailTemplateService {
        return ReUtil.findAllGroup1(PATTERN_PARAMS, content);
    }

-}
+}
@@ -69,6 +69,14 @@ public interface NotifyTemplateService {
     */
    PageResult<NotifyTemplateDO> getNotifyTemplatePage(NotifyTemplatePageReqVO pageReqVO);

+    /**
+     * 获得指定状态的站内信模版列表
+     *
+     * @param status 状态
+     * @return 站内信模版列表
+     */
+    List<NotifyTemplateDO> getNotifyTemplateListByStatus(Integer status);
+
    /**
     * 格式化站内信内容
     *
@@ -115,6 +115,11 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
        return notifyTemplateMapper.selectPage(pageReqVO);
    }

+    @Override
+    public List<NotifyTemplateDO> getNotifyTemplateListByStatus(Integer status) {
+        return notifyTemplateMapper.selectListByStatus(status);
+    }
+
    @VisibleForTesting
    void validateNotifyTemplateCodeDuplicate(Long id, String code) {
        NotifyTemplateDO template = notifyTemplateMapper.selectByCode(code);
@@ -70,6 +70,14 @@ public interface SmsTemplateService {
     */
    PageResult<SmsTemplateDO> getSmsTemplatePage(SmsTemplatePageReqVO pageReqVO);

+    /**
+     * 获得指定状态的短信模板列表
+     *
+     * @param status 状态
+     * @return 短信模板列表
+     */
+    List<SmsTemplateDO> getSmsTemplateListByStatus(Integer status);
+
    /**
     * 获得指定短信渠道下的短信模板数量
     *
@@ -130,6 +130,11 @@ public class SmsTemplateServiceImpl implements SmsTemplateService {
        return smsTemplateMapper.selectPage(pageReqVO);
    }

+    @Override
+    public List<SmsTemplateDO> getSmsTemplateListByStatus(Integer status) {
+        return smsTemplateMapper.selectListByStatus(status);
+    }
+
    @Override
    public Long getSmsTemplateCountByChannelId(Long channelId) {
        return smsTemplateMapper.selectCountByChannelId(channelId);