From 881b6feeeadec2d1d8d5739047674120d1cab576 Mon Sep 17 00:00:00 2001
From: zhuangtianxiang <2913129173@qq.com>
Date: Fri, 17 Jan 2025 12:32:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor(message):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 统一使用 AdminNoticeVo 作为返回类型
- 修正 UserNoticeMapper.xml 中的查询语句
- 更新相关控制器、仓库和服
---
 .../modules/message/controller/UserNoticeController.java        | 2 +-
 .../edu/gateway/modules/message/repo/UserNoticeRepository.java  | 2 +-
 .../edu/gateway/modules/message/service/UserNoticeService.java  | 2 +-
 .../modules/message/service/impl/UserNoticeServiceImpl.java     | 2 +-
 src/main/resources/mappers/notice/UserNoticeMapper.xml          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zsc/edu/gateway/modules/message/controller/UserNoticeController.java b/src/main/java/com/zsc/edu/gateway/modules/message/controller/UserNoticeController.java
index 3cbbf4e..1667c7d 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/message/controller/UserNoticeController.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/message/controller/UserNoticeController.java
@@ -108,7 +108,7 @@ public class UserNoticeController {
      */
     @GetMapping
     @PreAuthorize("hasAuthority('message:notice:query')")
-    public IPage<AdminNoticeVo> page(Page<UserNoticeVo> page, AdminNoticeQuery query) {
+    public IPage<AdminNoticeVo> page(Page<AdminNoticeVo> page, AdminNoticeQuery query) {
         return service.getAdminNoticePage(page, query);
     }
 
diff --git a/src/main/java/com/zsc/edu/gateway/modules/message/repo/UserNoticeRepository.java b/src/main/java/com/zsc/edu/gateway/modules/message/repo/UserNoticeRepository.java
index bdd7ad8..c63aaf3 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/message/repo/UserNoticeRepository.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/message/repo/UserNoticeRepository.java
@@ -21,5 +21,5 @@ public interface UserNoticeRepository extends BaseMapper<UserNotice> {
 
     IPage<UserNoticeVo> page(Page<UserNoticeVo> page, @Param("query") UserNoticeQuery query);
 
-    IPage<AdminNoticeVo> pageAdmin(Page<UserNoticeVo> page, @Param("query") AdminNoticeQuery query);
+    IPage<AdminNoticeVo> pageAdmin(Page<AdminNoticeVo> page, @Param("query") AdminNoticeQuery query);
 }
diff --git a/src/main/java/com/zsc/edu/gateway/modules/message/service/UserNoticeService.java b/src/main/java/com/zsc/edu/gateway/modules/message/service/UserNoticeService.java
index 8862747..60dc6d7 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/message/service/UserNoticeService.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/message/service/UserNoticeService.java
@@ -33,5 +33,5 @@ public interface UserNoticeService extends IService<UserNotice> {
 
     boolean markAllAsRead(UserDetailsImpl userDetails);
 
-    IPage<AdminNoticeVo> getAdminNoticePage(Page<UserNoticeVo> page, AdminNoticeQuery query);
+    IPage<AdminNoticeVo> getAdminNoticePage(Page<AdminNoticeVo> page, AdminNoticeQuery query);
 }
diff --git a/src/main/java/com/zsc/edu/gateway/modules/message/service/impl/UserNoticeServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/message/service/impl/UserNoticeServiceImpl.java
index cfe8acb..0a96dad 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/message/service/impl/UserNoticeServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/message/service/impl/UserNoticeServiceImpl.java
@@ -126,7 +126,7 @@ public class UserNoticeServiceImpl extends ServiceImpl<UserNoticeRepository, Use
      * @return 消息设置列表
      */
     @Override
-    public IPage<AdminNoticeVo> getAdminNoticePage(Page<UserNoticeVo> page, AdminNoticeQuery query) {
+    public IPage<AdminNoticeVo> getAdminNoticePage(Page<AdminNoticeVo> page, AdminNoticeQuery query) {
         return baseMapper.pageAdmin(page, query);
     }
 
diff --git a/src/main/resources/mappers/notice/UserNoticeMapper.xml b/src/main/resources/mappers/notice/UserNoticeMapper.xml
index 1d634f3..f6b34d5 100644
--- a/src/main/resources/mappers/notice/UserNoticeMapper.xml
+++ b/src/main/resources/mappers/notice/UserNoticeMapper.xml
@@ -79,7 +79,7 @@
         sn.create_time DESC
     </select>
 
-    <select id="pageAdmin" resultMap="userNoticeMap">
+    <select id="pageAdmin" resultMap="AdminNoticeMap">
         SELECT
         sn.*, -- 获取消息详情
         COUNT(DISTINCT sun.user_id) AS user_count, -- 统计用户的关联数量