From 1056a418262d499f07eb04a148ac4dd1f53d3682 Mon Sep 17 00:00:00 2001 From: liuhanqing <447067298@qq.com> Date: Fri, 8 Jan 2021 21:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90message=E3=80=91=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/enums/MessageBusinessTypeEnum.java | 18 +++++++++++------- .../api/enums/MessageProrityLevelEnum.java | 4 ++-- .../message/api/enums/MessageReadFlagEnum.java | 4 ++-- .../message/db/MessageDbServiceImpl.java | 12 ++++++++---- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageBusinessTypeEnum.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageBusinessTypeEnum.java index 198c5340c..44107700e 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageBusinessTypeEnum.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageBusinessTypeEnum.java @@ -3,7 +3,7 @@ package cn.stylefeng.roses.kernel.message.api.enums; import lombok.Getter; /** - * 消息阅读状态 + * 消息业务类型枚举 * * @author liuhanqing * @date 2021/1/4 22:26 @@ -14,24 +14,28 @@ public enum MessageBusinessTypeEnum { /** * 已读 */ - SYS_NOTICE("sys_notice", "系统通知"); + SYS_NOTICE("sys_notice", "系统通知", "/sysNotice/detail"); - private String code; + private final String code; - private String name; + private final String name; - MessageBusinessTypeEnum(String code, String name) { + private final String url; + + + MessageBusinessTypeEnum(String code, String name, String url) { this.code = code; this.name = name; + this.url = url; } - public static String getName(String code) { + public static MessageBusinessTypeEnum getByCode(String code) { if (code == null) { return null; } for (MessageBusinessTypeEnum flagEnum : MessageBusinessTypeEnum.values()) { if (flagEnum.getCode().equals(code)) { - return flagEnum.name; + return flagEnum; } } return null; diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageProrityLevelEnum.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageProrityLevelEnum.java index 496bcda88..e25f0b0c3 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageProrityLevelEnum.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageProrityLevelEnum.java @@ -26,9 +26,9 @@ public enum MessageProrityLevelEnum { */ LOW("low", "低"); - private String code; + private final String code; - private String name; + private final String name; MessageProrityLevelEnum(String code, String name) { this.code = code; diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageReadFlagEnum.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageReadFlagEnum.java index 2dde36dd8..1c5f988cd 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageReadFlagEnum.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageReadFlagEnum.java @@ -21,9 +21,9 @@ public enum MessageReadFlagEnum { */ READ(1, "已读"); - private Integer code; + private final Integer code; - private String name; + private final String name; MessageReadFlagEnum(Integer code, String name) { this.code = code; 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 d5b412532..b844904a2 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 @@ -9,6 +9,7 @@ import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.message.api.MessageApi; import cn.stylefeng.roses.kernel.message.api.constants.MessageConstants; 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.MessageParam; import cn.stylefeng.roses.kernel.message.api.pojo.MessageResponse; @@ -17,7 +18,6 @@ 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; import cn.stylefeng.roses.kernel.system.UserServiceApi; -import cn.stylefeng.roses.kernel.system.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; @@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** * 系统消息，数据库实现 @@ -62,7 +63,7 @@ public class MessageDbServiceImpl implements MessageApi { userIds = Convert.toList(Long.class, userIdArr); } if (userIds == null || userIds.isEmpty()) { - throw new SystemModularException(MessageExceptionEnum.ERROR_RECEIVE_USER_IDS, "传入接收用户id字符串不合法：" + receiveUserIds); + throw new MessageException(MessageExceptionEnum.ERROR_RECEIVE_USER_IDS); } Set userIdSet = new HashSet<>(userIds); @@ -164,8 +165,11 @@ public class MessageDbServiceImpl implements MessageApi { @Override public List queryList(MessageParam messageParam) { List messageList = sysMessageService.list(messageParam); - List resultList = new ArrayList<>(); - BeanUtil.copyProperties(messageList, resultList); + List resultList = messageList.stream().map(msg -> { + MessageResponse response = new MessageResponse(); + BeanUtil.copyProperties(msg, response); + return response; + }).collect(Collectors.toList()); return resultList; }