From 1619e5d2d7bbe374cefc3af27ff1444fb5031c13 Mon Sep 17 00:00:00 2001 From: hansson <447067298@qq.com> Date: Thu, 14 Jan 2021 15:33:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90notice=E3=80=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ityLevelEnum.java => MessagePriorityLevelEnum.java} | 6 +++--- .../roses/kernel/message/api/pojo/MessageResponse.java | 4 ++-- .../roses/kernel/notice/modular/entity/SysNotice.java | 10 ++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) rename kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/{MessageProrityLevelEnum.java => MessagePriorityLevelEnum.java} (79%) 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/MessagePriorityLevelEnum.java similarity index 79% rename from kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessageProrityLevelEnum.java rename to kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/enums/MessagePriorityLevelEnum.java index e25f0b0c3..1d0d66619 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/MessagePriorityLevelEnum.java @@ -9,7 +9,7 @@ import lombok.Getter; * @date 2021/1/8 13:26 */ @Getter -public enum MessageProrityLevelEnum { +public enum MessagePriorityLevelEnum { /** * 高 @@ -30,7 +30,7 @@ public enum MessageProrityLevelEnum { private final String name; - MessageProrityLevelEnum(String code, String name) { + MessagePriorityLevelEnum(String code, String name) { this.code = code; this.name = name; } @@ -39,7 +39,7 @@ public enum MessageProrityLevelEnum { if (code == null) { return null; } - for (MessageProrityLevelEnum flagEnum : MessageProrityLevelEnum.values()) { + for (MessagePriorityLevelEnum flagEnum : MessagePriorityLevelEnum.values()) { if (flagEnum.getCode().equals(code)) { return flagEnum.name; } diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java index 511c2b2ba..c04cdec3b 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.message.api.pojo; -import cn.stylefeng.roses.kernel.message.api.enums.MessageProrityLevelEnum; +import cn.stylefeng.roses.kernel.message.api.enums.MessagePriorityLevelEnum; import cn.stylefeng.roses.kernel.message.api.enums.MessageReadFlagEnum; import lombok.Data; @@ -86,7 +86,7 @@ public class MessageResponse implements Serializable { public String getPriorityLevelValue(){ AtomicReference value = new AtomicReference<>(""); Optional.ofNullable(this.priorityLevel).ifPresent(val ->{ - value.set(MessageProrityLevelEnum.getName(this.priorityLevel)); + value.set(MessagePriorityLevelEnum.getName(this.priorityLevel)); }); return value.get(); } diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/entity/SysNotice.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/entity/SysNotice.java index f8a157b40..3bd509662 100644 --- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/entity/SysNotice.java +++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/entity/SysNotice.java @@ -1,6 +1,7 @@ package cn.stylefeng.roses.kernel.notice.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; +import cn.stylefeng.roses.kernel.message.api.enums.MessagePriorityLevelEnum; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,6 +10,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicReference; /** * 通知表 @@ -76,5 +79,12 @@ public class SysNotice extends BaseEntity { @TableField(value = "del_flag", fill = FieldFill.INSERT) private String delFlag; + public String getPriorityLevelValue(){ + AtomicReference value = new AtomicReference<>(""); + Optional.ofNullable(this.priorityLevel).ifPresent(val ->{ + value.set(MessagePriorityLevelEnum.getName(this.priorityLevel)); + }); + return value.get(); + } }