vertoryao/iot-gateway
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(message): 优化消息分页查询接口

Browse Source 
- 统一使用 AdminNoticeVo 作为返回类型
- 修正 UserNoticeMapper.xml 中的查询语句
- 更新相关控制器、仓库和服
This commit is contained in:
zhuangtianxiang 2025-01-17 12:32:56 +08:00
parent 8f5c5d1726
commit 881b6feeea
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zsc/edu/gateway/modules/message/controller/UserNoticeController.java
View File

@ -108,7 +108,7 @@ public class UserNoticeController {
*/ */
@GetMapping @GetMapping
@PreAuthorize("hasAuthority('message:notice:query')") @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); return service.getAdminNoticePage(page, query);
} }

2
src/main/java/com/zsc/edu/gateway/modules/message/repo/UserNoticeRepository.java
View File

@ -21,5 +21,5 @@ public interface UserNoticeRepository extends BaseMapper<UserNotice> {
IPage<UserNoticeVo> page(Page<UserNoticeVo> page, @Param("query") UserNoticeQuery query); 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);
} }

2
src/main/java/com/zsc/edu/gateway/modules/message/service/UserNoticeService.java
View File

@ -33,5 +33,5 @@ public interface UserNoticeService extends IService<UserNotice> {
boolean markAllAsRead(UserDetailsImpl userDetails); boolean markAllAsRead(UserDetailsImpl userDetails);
IPage<AdminNoticeVo> getAdminNoticePage(Page<UserNoticeVo> page, AdminNoticeQuery query); IPage<AdminNoticeVo> getAdminNoticePage(Page<AdminNoticeVo> page, AdminNoticeQuery query);
} }

2
src/main/java/com/zsc/edu/gateway/modules/message/service/impl/UserNoticeServiceImpl.java
View File

@ -126,7 +126,7 @@ public class UserNoticeServiceImpl extends ServiceImpl<UserNoticeRepository, Use
* @return 消息设置列表 * @return 消息设置列表
*/ */
@Override @Override
public IPage<AdminNoticeVo> getAdminNoticePage(Page<UserNoticeVo> page, AdminNoticeQuery query) { public IPage<AdminNoticeVo> getAdminNoticePage(Page<AdminNoticeVo> page, AdminNoticeQuery query) {
return baseMapper.pageAdmin(page, query); return baseMapper.pageAdmin(page, query);
} }

2
src/main/resources/mappers/notice/UserNoticeMapper.xml
View File

@ -79,7 +79,7 @@
sn.create_time DESC sn.create_time DESC
</select> </select>
<select id="pageAdmin" resultMap="userNoticeMap"> <select id="pageAdmin" resultMap="AdminNoticeMap">
SELECT SELECT
sn.*, -- 获取消息详情 sn.*, -- 获取消息详情
COUNT(DISTINCT sun.user_id) AS user_count, -- 统计用户的关联数量 COUNT(DISTINCT sun.user_id) AS user_count, -- 统计用户的关联数量