From dbe93df8bcec0b7dfb24fbd92f35928a3156f4e5 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 27 Apr 2024 17:03:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=85=AC=E5=91=8A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20Announcement=20=3D>=20Notice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tStatusEnum.java => NoticeStatusEnum.java} |  2 +-
 ...ouncementMapper.java => NoticeMapper.java} |  8 ++--
 .../{AnnouncementDO.java => NoticeDO.java}    |  4 +-
 ...nnouncementQuery.java => NoticeQuery.java} |  2 +-
 .../admin/system/model/req/DictReq.java       |  2 +-
 .../{AnnouncementReq.java => NoticeReq.java}  |  6 +--
 ...mentResp.java => DashboardNoticeResp.java} |  6 +--
 .../admin/system/model/resp/DictResp.java     |  2 +-
 ...tDetailResp.java => NoticeDetailResp.java} |  6 +--
 ...{AnnouncementResp.java => NoticeResp.java} | 16 ++++----
 .../system/service/DashboardService.java      |  2 +-
 ...ncementService.java => NoticeService.java} | 16 ++++----
 .../service/impl/DashboardServiceImpl.java    |  8 ++--
 ...erviceImpl.java => NoticeServiceImpl.java} | 26 ++++++------
 ...nnouncementMapper.xml => NoticeMapper.xml} |  6 +--
 .../admin/webapi/common/CommonController.java |  2 +-
 .../webapi/common/DashboardController.java    |  8 ++--
 ...tController.java => NoticeController.java} | 40 +++++++++----------
 .../changelog/mysql/continew-admin_data.sql   |  2 +-
 .../changelog/mysql/continew-admin_table.sql  |  2 +-
 .../postgresql/continew-admin_data.sql        |  2 +-
 .../postgresql/continew-admin_table.sql       | 30 +++++++-------
 22 files changed, 98 insertions(+), 100 deletions(-)
 rename continew-admin-system/src/main/java/top/continew/admin/system/enums/{AnnouncementStatusEnum.java => NoticeStatusEnum.java} (95%)
 rename continew-admin-system/src/main/java/top/continew/admin/system/mapper/{AnnouncementMapper.java => NoticeMapper.java} (77%)
 rename continew-admin-system/src/main/java/top/continew/admin/system/model/entity/{AnnouncementDO.java => NoticeDO.java} (94%)
 rename continew-admin-system/src/main/java/top/continew/admin/system/model/query/{AnnouncementQuery.java => NoticeQuery.java} (96%)
 rename continew-admin-system/src/main/java/top/continew/admin/system/model/req/{AnnouncementReq.java => NoticeReq.java} (92%)
 rename continew-admin-system/src/main/java/top/continew/admin/system/model/resp/{DashboardAnnouncementResp.java => DashboardNoticeResp.java} (85%)
 rename continew-admin-system/src/main/java/top/continew/admin/system/model/resp/{AnnouncementDetailResp.java => NoticeDetailResp.java} (90%)
 rename continew-admin-system/src/main/java/top/continew/admin/system/model/resp/{AnnouncementResp.java => NoticeResp.java} (81%)
 rename continew-admin-system/src/main/java/top/continew/admin/system/service/{AnnouncementService.java => NoticeService.java} (62%)
 rename continew-admin-system/src/main/java/top/continew/admin/system/service/impl/{AnnouncementServiceImpl.java => NoticeServiceImpl.java} (57%)
 rename continew-admin-system/src/main/resources/mapper/{AnnouncementMapper.xml => NoticeMapper.xml} (79%)
 rename continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/{AnnouncementController.java => NoticeController.java} (68%)

diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/AnnouncementStatusEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java
similarity index 95%
rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/AnnouncementStatusEnum.java
rename to continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java
index 93f7aaf1..0d2a7cd9 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/AnnouncementStatusEnum.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java
@@ -29,7 +29,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum;
  */
 @Getter
 @RequiredArgsConstructor
-public enum AnnouncementStatusEnum implements IBaseEnum<Integer> {
+public enum NoticeStatusEnum implements IBaseEnum<Integer> {
 
     /**
      * 待发布
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/AnnouncementMapper.java b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java
similarity index 77%
rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/AnnouncementMapper.java
rename to continew-admin-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java
index c157cd69..2305e0d6 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/AnnouncementMapper.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java
@@ -16,8 +16,8 @@
 
 package top.continew.admin.system.mapper;
 
-import top.continew.admin.system.model.entity.AnnouncementDO;
-import top.continew.admin.system.model.resp.DashboardAnnouncementResp;
+import top.continew.admin.system.model.entity.NoticeDO;
+import top.continew.admin.system.model.resp.DashboardNoticeResp;
 import top.continew.starter.data.mybatis.plus.base.BaseMapper;
 
 import java.util.List;
@@ -28,12 +28,12 @@ import java.util.List;
  * @author Charles7c
  * @since 2023/8/20 10:55
  */
-public interface AnnouncementMapper extends BaseMapper<AnnouncementDO> {
+public interface NoticeMapper extends BaseMapper<NoticeDO> {
 
     /**
      * 查询仪表盘公告列表
      *
      * @return 仪表盘公告列表
      */
-    List<DashboardAnnouncementResp> selectDashboardList();
+    List<DashboardNoticeResp> selectDashboardList();
 }
\ No newline at end of file
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/AnnouncementDO.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java
similarity index 94%
rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/AnnouncementDO.java
rename to continew-admin-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java
index 61118b96..7758dfed 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/AnnouncementDO.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java
@@ -30,8 +30,8 @@ import java.time.LocalDateTime;
  * @since 2023/8/20 10:55
  */
 @Data
-@TableName("sys_announcement")
-public class AnnouncementDO extends BaseDO {
+@TableName("sys_notice")
+public class NoticeDO extends BaseDO {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/AnnouncementQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java
similarity index 96%
rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/AnnouncementQuery.java
rename to continew-admin-system/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java
index 1889900b..7336c290 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/AnnouncementQuery.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java
@@ -32,7 +32,7 @@ import java.io.Serializable;
  */
 @Data
 @Schema(description = "公告查询条件")
-public class AnnouncementQuery implements Serializable {
+public class NoticeQuery implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictReq.java
index 0c9fe3fc..d30faa09 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictReq.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictReq.java
@@ -50,7 +50,7 @@ public class DictReq extends BaseReq {
     /**
      * 编码
      */
-    @Schema(description = "编码", example = "announcement_type")
+    @Schema(description = "编码", example = "notice_type")
     @NotBlank(message = "编码不能为空")
     @Pattern(regexp = RegexConstants.GENERAL_CODE, message = "编码长度为 2 到 30 位，可以包含字母、数字，下划线，以字母开头")
     private String code;
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/AnnouncementReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/NoticeReq.java
similarity index 92%
rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/AnnouncementReq.java
rename to continew-admin-system/src/main/java/top/continew/admin/system/model/req/NoticeReq.java
index b843a45d..5daadb3a 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/AnnouncementReq.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/NoticeReq.java
@@ -34,7 +34,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @Schema(description = "创建或修改公告信息")
-public class AnnouncementReq extends BaseReq {
+public class NoticeReq extends BaseReq {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -55,9 +55,9 @@ public class AnnouncementReq extends BaseReq {
     private String content;
 
     /**
-     * 类型（取值于字典 announcement_type）
+     * 类型（取值于字典 notice_type）
      */
-    @Schema(description = "类型（取值于字典 announcement_type）", example = "1")
+    @Schema(description = "类型（取值于字典 notice_type）", example = "1")
     @NotBlank(message = "类型不能为空")
     @Length(max = 30, message = "类型长度不能超过 {max} 个字符")
     private String type;
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAnnouncementResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardNoticeResp.java
similarity index 85%
rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAnnouncementResp.java
rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardNoticeResp.java
index 9ea51652..14f54362 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAnnouncementResp.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardNoticeResp.java
@@ -30,7 +30,7 @@ import java.io.Serializable;
  */
 @Data
 @Schema(description = "仪表盘-公告信息")
-public class DashboardAnnouncementResp implements Serializable {
+public class DashboardNoticeResp implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -48,8 +48,8 @@ public class DashboardAnnouncementResp implements Serializable {
     private String title;
 
     /**
-     * 类型（取值于字典 announcement_type）
+     * 类型（取值于字典 notice_type）
      */
-    @Schema(description = "类型（取值于字典 announcement_type）", example = "1")
+    @Schema(description = "类型（取值于字典 notice_type）", example = "1")
     private String type;
 }
\ No newline at end of file
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java
index 03d63128..f7227ed9 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java
@@ -44,7 +44,7 @@ public class DictResp extends BaseDetailResp {
     /**
      * 编码
      */
-    @Schema(description = "编码", example = "announcement_type")
+    @Schema(description = "编码", example = "notice_type")
     private String code;
 
     /**
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AnnouncementDetailResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java
similarity index 90%
rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AnnouncementDetailResp.java
rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java
index 70c83727..d61d62b2 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AnnouncementDetailResp.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java
@@ -34,7 +34,7 @@ import java.time.LocalDateTime;
 @Data
 @ExcelIgnoreUnannotated
 @Schema(description = "公告详情信息")
-public class AnnouncementDetailResp extends BaseDetailResp {
+public class NoticeDetailResp extends BaseDetailResp {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -54,9 +54,9 @@ public class AnnouncementDetailResp extends BaseDetailResp {
     private String content;
 
     /**
-     * 类型（取值于字典 announcement_type）
+     * 类型（取值于字典 notice_type）
      */
-    @Schema(description = "类型（取值于字典 announcement_type）", example = "1")
+    @Schema(description = "类型（取值于字典 notice_type）", example = "1")
     @ExcelProperty(value = "类型")
     private String type;
 
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AnnouncementResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java
similarity index 81%
rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AnnouncementResp.java
rename to continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java
index 6909297f..8df55fd0 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AnnouncementResp.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java
@@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import top.continew.admin.system.enums.AnnouncementStatusEnum;
+import top.continew.admin.system.enums.NoticeStatusEnum;
 import top.continew.starter.extension.crud.model.resp.BaseResp;
 
 import java.io.Serial;
@@ -32,7 +32,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @Schema(description = "公告信息")
-public class AnnouncementResp extends BaseResp {
+public class NoticeResp extends BaseResp {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -44,9 +44,9 @@ public class AnnouncementResp extends BaseResp {
     private String title;
 
     /**
-     * 类型（取值于字典 announcement_type）
+     * 类型（取值于字典 notice_type）
      */
-    @Schema(description = "类型（取值于字典 announcement_type）", example = "1")
+    @Schema(description = "类型（取值于字典 notice_type）", example = "1")
     private String type;
 
     /**
@@ -67,13 +67,13 @@ public class AnnouncementResp extends BaseResp {
      * @return 公告状态
      */
     @Schema(description = "状态（1：待发布；2：已发布；3：已过期）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1")
-    public AnnouncementStatusEnum getStatus() {
+    public NoticeStatusEnum getStatus() {
         if (null != this.effectiveTime && this.effectiveTime.isAfter(LocalDateTime.now())) {
-            return AnnouncementStatusEnum.PENDING_RELEASE;
+            return NoticeStatusEnum.PENDING_RELEASE;
         }
         if (null != this.terminateTime && this.terminateTime.isBefore(LocalDateTime.now())) {
-            return AnnouncementStatusEnum.EXPIRED;
+            return NoticeStatusEnum.EXPIRED;
         }
-        return AnnouncementStatusEnum.PUBLISHED;
+        return NoticeStatusEnum.PUBLISHED;
     }
 }
\ No newline at end of file
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java
index 570705b3..5d347df0 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java
@@ -62,5 +62,5 @@ public interface DashboardService {
      *
      * @return 公告列表
      */
-    List<DashboardAnnouncementResp> listAnnouncement();
+    List<DashboardNoticeResp> listNotice();
 }
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/AnnouncementService.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/NoticeService.java
similarity index 62%
rename from continew-admin-system/src/main/java/top/continew/admin/system/service/AnnouncementService.java
rename to continew-admin-system/src/main/java/top/continew/admin/system/service/NoticeService.java
index 47e2bf1e..1f5d276e 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/service/AnnouncementService.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/NoticeService.java
@@ -16,12 +16,12 @@
 
 package top.continew.admin.system.service;
 
-import top.continew.admin.system.model.entity.AnnouncementDO;
-import top.continew.admin.system.model.query.AnnouncementQuery;
-import top.continew.admin.system.model.req.AnnouncementReq;
-import top.continew.admin.system.model.resp.AnnouncementDetailResp;
-import top.continew.admin.system.model.resp.AnnouncementResp;
-import top.continew.admin.system.model.resp.DashboardAnnouncementResp;
+import top.continew.admin.system.model.entity.NoticeDO;
+import top.continew.admin.system.model.query.NoticeQuery;
+import top.continew.admin.system.model.req.NoticeReq;
+import top.continew.admin.system.model.resp.NoticeDetailResp;
+import top.continew.admin.system.model.resp.NoticeResp;
+import top.continew.admin.system.model.resp.DashboardNoticeResp;
 import top.continew.starter.extension.crud.service.BaseService;
 import top.continew.starter.data.mybatis.plus.service.IService;
 
@@ -33,12 +33,12 @@ import java.util.List;
  * @author Charles7c
  * @since 2023/8/20 10:55
  */
-public interface AnnouncementService extends BaseService<AnnouncementResp, AnnouncementDetailResp, AnnouncementQuery, AnnouncementReq>, IService<AnnouncementDO> {
+public interface NoticeService extends BaseService<NoticeResp, NoticeDetailResp, NoticeQuery, NoticeReq>, IService<NoticeDO> {
 
     /**
      * 查询仪表盘公告列表
      *
      * @return 仪表盘公告列表
      */
-    List<DashboardAnnouncementResp> listDashboard();
+    List<DashboardNoticeResp> listDashboard();
 }
\ No newline at end of file
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java
index 9a655dd5..bb1e34e8 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java
@@ -20,7 +20,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.NumberUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import top.continew.admin.system.service.AnnouncementService;
+import top.continew.admin.system.service.NoticeService;
 import top.continew.admin.system.service.DashboardService;
 import top.continew.admin.system.service.LogService;
 import top.continew.admin.system.model.resp.*;
@@ -40,7 +40,7 @@ import java.util.Map;
 public class DashboardServiceImpl implements DashboardService {
 
     private final LogService logService;
-    private final AnnouncementService announcementService;
+    private final NoticeService noticeService;
 
     @Override
     public DashboardTotalResp getTotal() {
@@ -85,7 +85,7 @@ public class DashboardServiceImpl implements DashboardService {
     }
 
     @Override
-    public List<DashboardAnnouncementResp> listAnnouncement() {
-        return announcementService.listDashboard();
+    public List<DashboardNoticeResp> listNotice() {
+        return noticeService.listDashboard();
     }
 }
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/AnnouncementServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java
similarity index 57%
rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/AnnouncementServiceImpl.java
rename to continew-admin-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java
index 986cb93d..c6e56a49 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/AnnouncementServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java
@@ -16,22 +16,20 @@
 
 package top.continew.admin.system.service.impl;
 
-import java.util.List;
-
 import lombok.RequiredArgsConstructor;
-
 import org.springframework.stereotype.Service;
-
-import top.continew.admin.system.mapper.AnnouncementMapper;
-import top.continew.admin.system.model.entity.AnnouncementDO;
-import top.continew.admin.system.model.query.AnnouncementQuery;
-import top.continew.admin.system.model.req.AnnouncementReq;
-import top.continew.admin.system.model.resp.AnnouncementDetailResp;
-import top.continew.admin.system.model.resp.AnnouncementResp;
-import top.continew.admin.system.model.resp.DashboardAnnouncementResp;
-import top.continew.admin.system.service.AnnouncementService;
+import top.continew.admin.system.mapper.NoticeMapper;
+import top.continew.admin.system.model.entity.NoticeDO;
+import top.continew.admin.system.model.query.NoticeQuery;
+import top.continew.admin.system.model.req.NoticeReq;
+import top.continew.admin.system.model.resp.DashboardNoticeResp;
+import top.continew.admin.system.model.resp.NoticeDetailResp;
+import top.continew.admin.system.model.resp.NoticeResp;
+import top.continew.admin.system.service.NoticeService;
 import top.continew.starter.extension.crud.service.impl.BaseServiceImpl;
 
+import java.util.List;
+
 /**
  * 公告业务实现
  *
@@ -40,10 +38,10 @@ import top.continew.starter.extension.crud.service.impl.BaseServiceImpl;
  */
 @Service
 @RequiredArgsConstructor
-public class AnnouncementServiceImpl extends BaseServiceImpl<AnnouncementMapper, AnnouncementDO, AnnouncementResp, AnnouncementDetailResp, AnnouncementQuery, AnnouncementReq> implements AnnouncementService {
+public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, NoticeDO, NoticeResp, NoticeDetailResp, NoticeQuery, NoticeReq> implements NoticeService {
 
     @Override
-    public List<DashboardAnnouncementResp> listDashboard() {
+    public List<DashboardNoticeResp> listDashboard() {
         return baseMapper.selectDashboardList();
     }
 }
\ No newline at end of file
diff --git a/continew-admin-system/src/main/resources/mapper/AnnouncementMapper.xml b/continew-admin-system/src/main/resources/mapper/NoticeMapper.xml
similarity index 79%
rename from continew-admin-system/src/main/resources/mapper/AnnouncementMapper.xml
rename to continew-admin-system/src/main/resources/mapper/NoticeMapper.xml
index 4def07c1..f5bc6224 100644
--- a/continew-admin-system/src/main/resources/mapper/AnnouncementMapper.xml
+++ b/continew-admin-system/src/main/resources/mapper/NoticeMapper.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="top.continew.admin.system.mapper.AnnouncementMapper">
+<mapper namespace="top.continew.admin.system.mapper.NoticeMapper">
 
     <select id="selectDashboardList"
-            resultType="top.continew.admin.system.model.resp.DashboardAnnouncementResp">
+            resultType="top.continew.admin.system.model.resp.DashboardNoticeResp">
         SELECT
             id, title, type
-        FROM sys_announcement
+        FROM sys_notice
         WHERE (effective_time IS NULL OR NOW() > effective_time)
           AND (terminate_time IS NULL OR terminate_time > NOW())
         ORDER BY sort ASC, effective_time DESC
diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java
index 62d97e1c..b287edaf 100644
--- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java
+++ b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/CommonController.java
@@ -102,7 +102,7 @@ public class CommonController {
     }
 
     @Operation(summary = "查询字典", description = "查询字典列表")
-    @Parameter(name = "code", description = "字典编码", example = "announcement_type", in = ParameterIn.PATH)
+    @Parameter(name = "code", description = "字典编码", example = "notice_type", in = ParameterIn.PATH)
     @GetMapping("/dict/{code}")
     public R<List<LabelValueResp<Serializable>>> listDict(@PathVariable String code) {
         Optional<Class<?>> enumClassOptional = this.getEnumClassByName(code);
diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/DashboardController.java b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/DashboardController.java
index 55f41329..d4523dba 100644
--- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/DashboardController.java
+++ b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/common/DashboardController.java
@@ -36,7 +36,7 @@ import top.continew.admin.system.model.resp.DashboardGeoDistributionResp;
 import top.continew.admin.system.model.resp.DashboardPopularModuleResp;
 import top.continew.admin.system.model.resp.DashboardTotalResp;
 import top.continew.admin.system.service.DashboardService;
-import top.continew.admin.system.model.resp.DashboardAnnouncementResp;
+import top.continew.admin.system.model.resp.DashboardNoticeResp;
 import top.continew.starter.core.util.validate.ValidationUtils;
 import top.continew.starter.web.model.R;
 import top.continew.starter.log.core.annotation.Log;
@@ -89,8 +89,8 @@ public class DashboardController {
     }
 
     @Operation(summary = "查询公告列表", description = "查询公告列表")
-    @GetMapping("/announcement")
-    public R<List<DashboardAnnouncementResp>> listAnnouncement() {
-        return R.ok(dashboardService.listAnnouncement());
+    @GetMapping("/notice")
+    public R<List<DashboardNoticeResp>> listNotice() {
+        return R.ok(dashboardService.listNotice());
     }
 }
diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/AnnouncementController.java b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java
similarity index 68%
rename from continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/AnnouncementController.java
rename to continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java
index 8ac1fba7..7db3419f 100644
--- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/AnnouncementController.java
+++ b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java
@@ -16,26 +16,26 @@
 
 package top.continew.admin.webapi.system;
 
-import java.time.LocalDateTime;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
 import cn.dev33.satoken.annotation.SaCheckPermission;
-
-import top.continew.admin.system.model.query.AnnouncementQuery;
-import top.continew.admin.system.model.req.AnnouncementReq;
-import top.continew.admin.system.model.resp.AnnouncementDetailResp;
-import top.continew.admin.system.model.resp.AnnouncementResp;
-import top.continew.admin.system.service.AnnouncementService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import top.continew.admin.system.model.query.NoticeQuery;
+import top.continew.admin.system.model.req.NoticeReq;
+import top.continew.admin.system.model.resp.NoticeDetailResp;
+import top.continew.admin.system.model.resp.NoticeResp;
+import top.continew.admin.system.service.NoticeService;
 import top.continew.starter.core.util.validate.ValidationUtils;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
 import top.continew.starter.extension.crud.controller.BaseController;
+import top.continew.starter.extension.crud.enums.Api;
 import top.continew.starter.extension.crud.util.ValidateGroup;
 import top.continew.starter.web.model.R;
 
+import java.time.LocalDateTime;
+
 /**
  * 公告管理 API
  *
@@ -44,19 +44,19 @@ import top.continew.starter.web.model.R;
  */
 @Tag(name = "公告管理 API")
 @RestController
-@CrudRequestMapping("/system/announcement")
-public class AnnouncementController extends BaseController<AnnouncementService, AnnouncementResp, AnnouncementDetailResp, AnnouncementQuery, AnnouncementReq> {
+@CrudRequestMapping(value = "/system/notice", api = {Api.PAGE, Api.GET, Api.ADD, Api.UPDATE, Api.DELETE})
+public class NoticeController extends BaseController<NoticeService, NoticeResp, NoticeDetailResp, NoticeQuery, NoticeReq> {
 
     @Override
-    @SaCheckPermission("system:announcement:add")
-    public R<Long> add(@Validated(ValidateGroup.Crud.Add.class) @RequestBody AnnouncementReq req) {
+    @SaCheckPermission("system:notice:add")
+    public R<Long> add(@Validated(ValidateGroup.Crud.Add.class) @RequestBody NoticeReq req) {
         this.checkTime(req);
         return super.add(req);
     }
 
     @Override
-    @SaCheckPermission("system:announcement:update")
-    public R<Void> update(@Validated(ValidateGroup.Crud.Update.class) @RequestBody AnnouncementReq req,
+    @SaCheckPermission("system:notice:update")
+    public R<Void> update(@Validated(ValidateGroup.Crud.Update.class) @RequestBody NoticeReq req,
                           @PathVariable Long id) {
         this.checkTime(req);
         return super.update(req, id);
@@ -67,7 +67,7 @@ public class AnnouncementController extends BaseController<AnnouncementService,
      *
      * @param req 创建或修改信息
      */
-    private void checkTime(AnnouncementReq req) {
+    private void checkTime(NoticeReq req) {
         LocalDateTime effectiveTime = req.getEffectiveTime();
         LocalDateTime terminateTime = req.getTerminateTime();
         if (null != effectiveTime && null != terminateTime) {
diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_data.sql b/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_data.sql
index 49fee4e7..4de1546a 100644
--- a/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_data.sql
+++ b/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_data.sql
@@ -120,7 +120,7 @@ VALUES
 INSERT INTO `sys_dict`
 (`id`, `name`, `code`, `description`, `is_system`, `create_user`, `create_time`, `update_user`, `update_time`)
 VALUES
-(547889614262632491, '公告类型', 'announcement_type', NULL, b'1', 1, NOW(), NULL, NULL);
+(547889614262632491, '公告类型', 'notice_type', NULL, b'1', 1, NOW(), NULL, NULL);
 
 INSERT INTO `sys_dict_item`
 (`id`, `label`, `value`, `color`, `sort`, `description`, `status`, `dict_id`, `create_user`, `create_time`, `update_user`, `update_time`)
diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_table.sql b/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_table.sql
index 0e8cbf56..c01dddec 100644
--- a/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_table.sql
+++ b/continew-admin-webapi/src/main/resources/db/changelog/mysql/continew-admin_table.sql
@@ -215,7 +215,7 @@ CREATE TABLE IF NOT EXISTS `sys_message_user` (
     PRIMARY KEY (`message_id`, `user_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='消息和用户关联表';
 
-CREATE TABLE IF NOT EXISTS `sys_announcement` (
+CREATE TABLE IF NOT EXISTS `sys_notice` (
     `id`             bigint(20)   NOT NULL             COMMENT 'ID',
     `title`          varchar(150) NOT NULL             COMMENT '标题',
     `content`        mediumtext   NOT NULL             COMMENT '内容',
diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_data.sql b/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_data.sql
index 916044fd..f3a852f6 100644
--- a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_data.sql
+++ b/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_data.sql
@@ -120,7 +120,7 @@ VALUES
 INSERT INTO "sys_dict"
 ("id", "name", "code", "description", "is_system", "create_user", "create_time", "update_user", "update_time")
 VALUES
-(547889614262632491, '公告类型', 'announcement_type', NULL, true, 1, NOW(), NULL, NULL);
+(547889614262632491, '公告类型', 'notice_type', NULL, true, 1, NOW(), NULL, NULL);
 
 INSERT INTO "sys_dict_item"
 ("id", "label", "value", "color", "sort", "description", "status", "dict_id", "create_user", "create_time", "update_user", "update_time")
diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_table.sql b/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_table.sql
index 13d0a91b..c456d161 100644
--- a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_table.sql
+++ b/continew-admin-webapi/src/main/resources/db/changelog/postgresql/continew-admin_table.sql
@@ -360,7 +360,7 @@ COMMENT ON COLUMN "sys_message_user"."is_read"    IS '是否已读';
 COMMENT ON COLUMN "sys_message_user"."read_time"  IS '读取时间';
 COMMENT ON TABLE  "sys_message_user"              IS '消息和用户关联表';
 
-CREATE TABLE IF NOT EXISTS "sys_announcement" (
+CREATE TABLE IF NOT EXISTS "sys_notice" (
     "id"             int8         NOT NULL,
     "title"          varchar(150) NOT NULL,
     "content"        text         NOT NULL,
@@ -374,20 +374,20 @@ CREATE TABLE IF NOT EXISTS "sys_announcement" (
     "update_time"    timestamp    DEFAULT NULL,
     PRIMARY KEY ("id")
 );
-CREATE INDEX "idx_announcement_create_user" ON "sys_announcement" ("create_user");
-CREATE INDEX "idx_announcement_update_user" ON "sys_announcement" ("update_user");
-COMMENT ON COLUMN "sys_announcement"."id"             IS 'ID';
-COMMENT ON COLUMN "sys_announcement"."title"          IS '标题';
-COMMENT ON COLUMN "sys_announcement"."content"        IS '内容';
-COMMENT ON COLUMN "sys_announcement"."type"           IS '类型';
-COMMENT ON COLUMN "sys_announcement"."effective_time" IS '生效时间';
-COMMENT ON COLUMN "sys_announcement"."terminate_time" IS '终止时间';
-COMMENT ON COLUMN "sys_announcement"."sort"           IS '排序';
-COMMENT ON COLUMN "sys_announcement"."create_user"    IS '创建人';
-COMMENT ON COLUMN "sys_announcement"."create_time"    IS '创建时间';
-COMMENT ON COLUMN "sys_announcement"."update_user"    IS '修改人';
-COMMENT ON COLUMN "sys_announcement"."update_time"    IS '修改时间';
-COMMENT ON TABLE  "sys_announcement"                  IS '公告表';
+CREATE INDEX "idx_notice_create_user" ON "sys_notice" ("create_user");
+CREATE INDEX "idx_notice_update_user" ON "sys_notice" ("update_user");
+COMMENT ON COLUMN "sys_notice"."id"             IS 'ID';
+COMMENT ON COLUMN "sys_notice"."title"          IS '标题';
+COMMENT ON COLUMN "sys_notice"."content"        IS '内容';
+COMMENT ON COLUMN "sys_notice"."type"           IS '类型';
+COMMENT ON COLUMN "sys_notice"."effective_time" IS '生效时间';
+COMMENT ON COLUMN "sys_notice"."terminate_time" IS '终止时间';
+COMMENT ON COLUMN "sys_notice"."sort"           IS '排序';
+COMMENT ON COLUMN "sys_notice"."create_user"    IS '创建人';
+COMMENT ON COLUMN "sys_notice"."create_time"    IS '创建时间';
+COMMENT ON COLUMN "sys_notice"."update_user"    IS '修改人';
+COMMENT ON COLUMN "sys_notice"."update_time"    IS '修改时间';
+COMMENT ON TABLE  "sys_notice"                  IS '公告表';
 
 CREATE TABLE IF NOT EXISTS "sys_storage" (
     "id"          int8         NOT NULL,