refactor: 通知公告重构

src/main/java/com/youlai/boot/system/model/entity/Menu.java

@@ -2,7 +2,7 @@ package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 
-import com.youlai.boot.common.enums.MenuTypeEnum;
+import com.youlai.boot.system.enums.MenuTypeEnum;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/system/model/entity/Notice.java

@@ -2,11 +2,11 @@ package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serial;
 import java.time.LocalDateTime;
 /**
  * 通知公告实体对象
@@ -19,6 +19,7 @@ import java.time.LocalDateTime;
 @TableName("sys_notice")
 public class Notice extends BaseEntity {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**
@@ -32,41 +33,48 @@ public class Notice extends BaseEntity {
     /**
      * 通知类型
      */
-    private Integer noticeType;
+    private Integer type;
+
     /**
      * 发布人
      */
-    private Long releaseBy;
+    private Long publisherBy;
+
     /**
-     * 优先级(0-低 1-中 2-高)
+     * 通知等级（L: 低, M: 中, H: 高）
      */
-    private Integer priority;
+    private String level;
+
     /**
-     * 目标类型(0-全体 1-指定)
+     * 目标类型（1: 全体, 2: 指定）
      */
-    private Integer tarType;
+    private Integer targetType;
+
     /**
-     * 目标ID
+     * 目标用户ID集合
      */
-    private String tarIds;
+    private String targetUserIds;
+
     /**
-     * 发布状态(0-未发布 1已发布 2已撤回)
+     * 发布状态（0: 未发布, 1: 已发布, -1: 已撤回）
      */
-    private Integer releaseStatus;
+    private Integer publishStatus;
+
     /**
      * 发布时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime releaseTime;
+    private LocalDateTime publishTime;
+
     /**
      * 撤回时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime recallTime;
+    private LocalDateTime revokeTime;
+
     /**
      * 创建人ID
      */
     private Long createBy;
+
     /**
      * 更新人ID
      */

src/main/java/com/youlai/boot/system/model/entity/UserNotice.java

@@ -2,25 +2,24 @@ package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * 用户公告状态实体对象
+ * 用户通知公告实体对象
  *
  * @author youlaitech
  * @since 2024-08-28 16:56
  */
 @Getter
 @Setter
-@TableName("sys_notice_status")
-public class NoticeStatus implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+@TableName("sys_user_notice")
+public class UserNotice extends BaseEntity {
 
     /**
      * 主键ID
@@ -39,9 +38,15 @@ public class NoticeStatus implements Serializable {
     /**
      * 读取状态，0未读，1已读
      */
-    private Integer readStatus;
+    private Integer isRead;
     /**
      * 用户阅读时间
      */
     private LocalDateTime readTime;
+
+    /**
+     * 逻辑删除标识(0-未删除 1-已删除)
+     */
+    @TableLogic(value = "0", delval = "1")
+    private Integer isDeleted;
 }