wip: 通知公告开发

通知公告开发

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.EqualsAndHashCode;
 
 /**
  * 系统配置 实体
@@ -11,9 +12,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
  * @author Theo
  * @since 2024-07-29 11:17:26
  */
+@Data
+@EqualsAndHashCode(callSuper = true)
 @Schema(description = "系统配置")
 @TableName("sys_config")
-@Data
 public class Config extends BaseEntity {
 
     @Schema(description = "配置名称")

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

@@ -3,6 +3,7 @@ package com.youlai.boot.system.model.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 字典实体
@@ -10,8 +11,9 @@ import lombok.Data;
  * @author haoxr
  * @since 2022/12/17
  */
-@TableName("sys_dict")
 @Data
+@TableName("sys_dict")
+@EqualsAndHashCode(callSuper = true)
 public class Dict extends BaseEntity {
 
     /**

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

@@ -1,12 +1,15 @@
-package com.youlai.system.model.entity;
+package com.youlai.boot.system.model.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+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.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.system.common.base.BaseEntity;
 
+import java.time.LocalDateTime;
 /**
  * 通知公告实体对象
  *
@@ -44,15 +47,19 @@ public class Notice extends BaseEntity {
      * 目标类型(0-全体 1-指定)
      */
     private Integer tarType;
+    /**
+     * 目标ID
+     */
+    private String tarIds;
     /**
      * 发布状态(0-未发布 1已发布 2已撤回)
      */
-    private Integer sendStatus;
+    private Integer releaseStatus;
     /**
      * 发布时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime sendTime;
+    private LocalDateTime releaseTime;
     /**
      * 撤回时间
      */
@@ -61,13 +68,16 @@ public class Notice extends BaseEntity {
     /**
      * 创建人ID
      */
+    @TableField(fill = FieldFill.INSERT)
     private Long createBy;
     /**
      * 更新人ID
      */
+    @TableField(fill = FieldFill.UPDATE)
     private Long updateBy;
     /**
      * 逻辑删除标识(0-未删除 1-已删除)
      */
-    private Integer isDelete;
+    @TableLogic(value = "0", delval = "1")
+    private Integer isDeleted;
 }

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

@@ -1,14 +1,13 @@
-package com.youlai.system.model.entity;
+package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.system.common.base.BaseEntity;
 
 /**
  * 用户公告状态实体对象
@@ -38,11 +37,11 @@ public class NoticeStatus implements Serializable {
      */
     private Long userId;
     /**
-     * 读取状态，0未读，1已读取
+     * 读取状态，0未读，1已读
      */
-    private Long readStatus;
+    private Integer readStatus;
     /**
      * 用户阅读时间
      */
-    private LocalDateTime readTiem;
+    private LocalDateTime readTime;
 }