From 8cd14e900ec7a4fd55f67ea8a716a6384b0bb550 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 20 May 2021 15:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.4=E3=80=91=E6=9B=B4=E6=96=B0messag?=
 =?UTF-8?q?e=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/exception/enums/MessageExceptionEnum.java        | 2 +-
 .../roses/kernel/message/db/MessageDbServiceImpl.java    | 8 ++++++--
 .../notice/service/impl/SysNoticeServiceImpl.java        | 9 +++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java
index be8c98d0b..d353dba9c 100644
--- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java
+++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java
@@ -41,7 +41,7 @@ public enum MessageExceptionEnum implements AbstractExceptionEnum {
     /**
      * 发送系统消息时，传入的参数中receiveUserIds不合法
      */
-    ERROR_RECEIVE_USER_IDS(RuleConstants.BUSINESS_ERROR_TYPE_CODE + MessageConstants.MESSAGE_EXCEPTION_STEP_CODE + "01", "接收用户id字符串不合法！"),
+    ERROR_RECEIVE_USER_IDS(RuleConstants.BUSINESS_ERROR_TYPE_CODE + MessageConstants.MESSAGE_EXCEPTION_STEP_CODE + "01", "接收用户id字符串不合法！系统无人可接收消息！"),
 
     /**
      * 消息记录不存在
diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
index 0a652ad21..03fd0aaa3 100644
--- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
+++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
@@ -38,8 +38,8 @@ import cn.stylefeng.roses.kernel.message.api.enums.MessageReadFlagEnum;
 import cn.stylefeng.roses.kernel.message.api.exception.MessageException;
 import cn.stylefeng.roses.kernel.message.api.exception.enums.MessageExceptionEnum;
 import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageRequest;
-import cn.stylefeng.roses.kernel.message.api.pojo.response.MessageResponse;
 import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageSendRequest;
+import cn.stylefeng.roses.kernel.message.api.pojo.response.MessageResponse;
 import cn.stylefeng.roses.kernel.message.db.entity.SysMessage;
 import cn.stylefeng.roses.kernel.message.db.service.SysMessageService;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
@@ -76,11 +76,13 @@ public class MessageDbServiceImpl implements MessageApi {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void sendMessage(MessageSendRequest messageSendRequest) {
+
         String receiveUserIds = messageSendRequest.getReceiveUserIds();
-        // 获取当前登录人
         LoginUser loginUser = LoginContext.me().getLoginUser();
+
         List<SysMessage> sendMsgList = new ArrayList<>();
         List<Long> userIds;
+
         // 发送所有人判断
         if (MessageConstants.RECEIVE_ALL_USER_FLAG.equals(receiveUserIds)) {
             // 查询所有用户
@@ -89,6 +91,8 @@ public class MessageDbServiceImpl implements MessageApi {
             String[] userIdArr = receiveUserIds.split(",");
             userIds = Convert.toList(Long.class, userIdArr);
         }
+
+        // 无人可发，不发送
         if (userIds == null || userIds.isEmpty()) {
             throw new MessageException(MessageExceptionEnum.ERROR_RECEIVE_USER_IDS);
         }
diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java
index 0e5fce13d..39a9e1299 100644
--- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java
+++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java
@@ -36,10 +36,10 @@ import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageSendRequest;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException;
 import cn.stylefeng.roses.kernel.system.api.exception.enums.notice.NoticeExceptionEnum;
+import cn.stylefeng.roses.kernel.system.api.pojo.notice.SysNoticeRequest;
 import cn.stylefeng.roses.kernel.system.modular.notice.entity.SysNotice;
 import cn.stylefeng.roses.kernel.system.modular.notice.mapper.SysNoticeMapper;
 import cn.stylefeng.roses.kernel.system.modular.notice.service.SysNoticeService;
-import cn.stylefeng.roses.kernel.system.api.pojo.notice.SysNoticeRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -198,7 +198,12 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
         message.setBusinessId(sysNotice.getNoticeId());
         message.setMessageSendTime(new Date());
 
-        messageApi.sendMessage(message);
+        try {
+            messageApi.sendMessage(message);
+        } catch (Exception exception) {
+            // 发送失败打印异常
+            log.error("发送消息失败:", exception);
+        }
     }
 
 }