From 3ba3c7e42eeeb919a18311b2c4c88dcba984fbce Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Thu, 10 Oct 2024 09:14:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/iocoder/yudao/common/MessageSend.java | 20 ++++++++++++++++++ .../iocoder/yudao/common/dto/MessageDTO.java | 21 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 dl-module-repair/src/main/java/cn/iocoder/yudao/common/MessageSend.java create mode 100644 dl-module-repair/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/MessageSend.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/MessageSend.java new file mode 100644 index 00000000..6792d8c3 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/MessageSend.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.common; + +import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * 用于发送消息 + * + * @author 小李 + * @date 17:15 2024/10/9 +**/ +@Component +public class MessageSend { + + @Resource + private NotifyMessageSendApi messageSendApi; + +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java new file mode 100644 index 00000000..b0c9e67a --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java @@ -0,0 +1,21 @@ +package cn.iocoder.yudao.common.dto; + +import lombok.Data; + +/** + * 用于发消息 + * + * @author 小李 + * @date 17:34 2024/10/9 +**/ +@Data +public class MessageDTO { + + /** 接收方id 来自system_users */ + private Long userId; + + /** 使用的模板code */ + private String templateCode; + + +} From 9a4ff242d642293e0737e70591f248b18f403074 Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Thu, 10 Oct 2024 11:48:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/iocoder/yudao/common/MessageSend.java | 20 ------------------ .../iocoder/yudao/common/dto/MessageDTO.java | 21 ------------------- .../rescue/utils/RedissonDelayQueue.java | 5 ----- 3 files changed, 46 deletions(-) delete mode 100644 dl-module-repair/src/main/java/cn/iocoder/yudao/common/MessageSend.java delete mode 100644 dl-module-repair/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/MessageSend.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/MessageSend.java deleted file mode 100644 index 6792d8c3..00000000 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/MessageSend.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.yudao.common; - -import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - -/** - * 用于发送消息 - * - * @author 小李 - * @date 17:15 2024/10/9 -**/ -@Component -public class MessageSend { - - @Resource - private NotifyMessageSendApi messageSendApi; - -} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java deleted file mode 100644 index b0c9e67a..00000000 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.iocoder.yudao.common.dto; - -import lombok.Data; - -/** - * 用于发消息 - * - * @author 小李 - * @date 17:34 2024/10/9 -**/ -@Data -public class MessageDTO { - - /** 接收方id 来自system_users */ - private Long userId; - - /** 使用的模板code */ - private String templateCode; - - -} diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java index 0f31807a..4cf692c9 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java @@ -1,18 +1,13 @@ package cn.iocoder.yudao.module.rescue.utils; -import cn.hutool.extra.spring.SpringUtil; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.module.appBase.domain.SysAnnouncement; import cn.iocoder.yudao.module.appBase.service.ISysAnnouncementService; import cn.iocoder.yudao.module.constant.UserConstants; import cn.iocoder.yudao.module.rescue.dto.TaskDto; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; -import cn.iocoder.yudao.module.system.api.permission.RoleApi; -import cn.iocoder.yudao.module.system.api.permission.dto.RoleReqDTO; import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; import cn.iocoder.yudao.module.system.service.permission.RoleService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; From cc8c9e3ea8c2e813d44dcac7fe0857154271fb1c Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Thu, 10 Oct 2024 12:02:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/iocoder/yudao/common/MessageSend.java | 51 +++++++++++++++++++ .../iocoder/yudao/common/dto/MessageDTO.java | 24 +++++++++ 2 files changed, 75 insertions(+) create mode 100644 dl-module-base/src/main/java/cn/iocoder/yudao/common/MessageSend.java create mode 100644 dl-module-base/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/common/MessageSend.java b/dl-module-base/src/main/java/cn/iocoder/yudao/common/MessageSend.java new file mode 100644 index 00000000..deb65978 --- /dev/null +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/common/MessageSend.java @@ -0,0 +1,51 @@ +package cn.iocoder.yudao.common; + +import cn.hutool.core.collection.CollectionUtil; +import cn.iocoder.yudao.common.dto.MessageDTO; +import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi; +import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0; + +/** + * 用于发送消息 + * + * @author 小李 + * @date 17:15 2024/10/9 + **/ +@Component +public class MessageSend { + + @Resource + private NotifyMessageSendApi messageSendApi; + + /** + * 通用消息发送 + * + * @param messageDTO 消息对象 + * @author 小李 + * @date 9:58 2024/10/10 + **/ + public void send(MessageDTO messageDTO) { + // 设置参数 + Map map = new HashMap<>(); + for (int i = 1; i <= messageDTO.getParamList().size(); i++) { + map.put("key" + i, messageDTO.getParamList().get(i - 1)); + } + if (CollectionUtil.isEmpty(messageDTO.getUserIds())){ + throw exception0(500, "没有接收人"); + } + messageDTO.getUserIds().forEach(id -> { + messageSendApi.sendSingleMessageToAdmin( + new NotifySendSingleToUserReqDTO() + .setUserId(id) + .setTemplateCode(messageDTO.getTemplateCode()) + .setTemplateParams(map)); + }); + } +} diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java new file mode 100644 index 00000000..c1ccb675 --- /dev/null +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/common/dto/MessageDTO.java @@ -0,0 +1,24 @@ +package cn.iocoder.yudao.common.dto; + +import lombok.Data; + +import java.util.List; + +/** + * 用于发消息 + * + * @author 小李 + * @date 17:34 2024/10/9 + **/ +@Data +public class MessageDTO { + + /** 接收方ids 来自system_users */ + private List userIds; + + /** 模板枚举 */ + private String templateCode; + + /** 参数列表 */ + private List paramList; +}