From 0691b9311259069f3be074193ba02eeee3655314 Mon Sep 17 00:00:00 2001 From: Theo <971366405@qq.com> Date: Sat, 21 Sep 2024 21:43:20 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=80=9A=E7=9F=A5=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E7=9A=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 通知公告的优化 --- .../com/youlai/boot/system/controller/NoticeController.java | 5 +++-- .../com/youlai/boot/system/mapper/NoticeStatusMapper.java | 2 +- .../java/com/youlai/boot/system/model/vo/NoticeDetailVO.java | 2 +- .../java/com/youlai/boot/system/model/vo/NoticeStatusVO.java | 2 +- src/main/java/com/youlai/boot/system/model/vo/NoticeVO.java | 2 +- .../java/com/youlai/boot/system/service/NoticeService.java | 3 ++- .../com/youlai/boot/system/service/NoticeStatusService.java | 4 ++-- .../youlai/boot/system/service/impl/NoticeServiceImpl.java | 2 +- .../boot/system/service/impl/NoticeStatusServiceImpl.java | 2 +- src/main/resources/mapper/NoticeStatusMapper.xml | 3 ++- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/youlai/boot/system/controller/NoticeController.java b/src/main/java/com/youlai/boot/system/controller/NoticeController.java index 78bb8f53..3e2ac049 100644 --- a/src/main/java/com/youlai/boot/system/controller/NoticeController.java +++ b/src/main/java/com/youlai/boot/system/controller/NoticeController.java @@ -5,6 +5,7 @@ import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; import com.youlai.boot.system.model.form.NoticeForm; import com.youlai.boot.system.model.query.NoticeQuery; +import com.youlai.boot.system.model.vo.NoticeStatusVO; import com.youlai.boot.system.model.vo.NoticeVO; import com.youlai.boot.system.service.NoticeService; import com.youlai.boot.system.service.NoticeStatusService; @@ -123,8 +124,8 @@ public class NoticeController { @Operation(summary = "获取我的通知公告") @GetMapping("/my/page") - public PageResult getMyNoticePage(NoticeQuery queryParams) { - IPage result = noticeService.getMyNoticePage(queryParams); + public PageResult getMyNoticePage(NoticeQuery queryParams) { + IPage result = noticeService.getMyNoticePage(queryParams); return PageResult.success(result); } } diff --git a/src/main/java/com/youlai/boot/system/mapper/NoticeStatusMapper.java b/src/main/java/com/youlai/boot/system/mapper/NoticeStatusMapper.java index 779fa830..7de27f85 100644 --- a/src/main/java/com/youlai/boot/system/mapper/NoticeStatusMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/NoticeStatusMapper.java @@ -34,5 +34,5 @@ public interface NoticeStatusMapper extends BaseMapper { * @param queryParams 查询参数 * @return 通知公告分页列表 */ - IPage getMyNoticePage(Page page, @Param("queryParams") NoticeQuery queryParams); + IPage getMyNoticePage(Page page, @Param("queryParams") NoticeQuery queryParams); } diff --git a/src/main/java/com/youlai/boot/system/model/vo/NoticeDetailVO.java b/src/main/java/com/youlai/boot/system/model/vo/NoticeDetailVO.java index 27bb9f26..8070fdea 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/NoticeDetailVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/NoticeDetailVO.java @@ -25,7 +25,7 @@ public class NoticeDetailVO { private String content; @Schema(description = "通知类型") - private String noticeTypeLabel; + private String noticeType; @Schema(description = "发布人") private String releaseBy; diff --git a/src/main/java/com/youlai/boot/system/model/vo/NoticeStatusVO.java b/src/main/java/com/youlai/boot/system/model/vo/NoticeStatusVO.java index 7fc953e1..119638f1 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/NoticeStatusVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/NoticeStatusVO.java @@ -23,7 +23,7 @@ public class NoticeStatusVO { private String title; @Schema(description = "通知类型") - private String noticeTypeLabel; + private String noticeType; @Schema(description = "发布人") private String releaseBy; diff --git a/src/main/java/com/youlai/boot/system/model/vo/NoticeVO.java b/src/main/java/com/youlai/boot/system/model/vo/NoticeVO.java index f0d86ffb..70c3789f 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/NoticeVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/NoticeVO.java @@ -29,7 +29,7 @@ public class NoticeVO implements Serializable { private String title; @Schema(description = "通知类型") - private String noticeTypeLabel; + private String noticeType; @Schema(description = "发布人") private String releaseBy; diff --git a/src/main/java/com/youlai/boot/system/service/NoticeService.java b/src/main/java/com/youlai/boot/system/service/NoticeService.java index 66e31f32..8b6ddebf 100644 --- a/src/main/java/com/youlai/boot/system/service/NoticeService.java +++ b/src/main/java/com/youlai/boot/system/service/NoticeService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.system.model.entity.Notice; import com.youlai.boot.system.model.form.NoticeForm; import com.youlai.boot.system.model.query.NoticeQuery; +import com.youlai.boot.system.model.vo.NoticeStatusVO; import com.youlai.boot.system.model.vo.NoticeVO; import com.youlai.boot.system.model.vo.NoticeDetailVO; @@ -92,5 +93,5 @@ public interface NoticeService extends IService { * @param queryParams 查询参数 * @return 通知公告分页列表 */ - IPage getMyNoticePage(NoticeQuery queryParams); + IPage getMyNoticePage(NoticeQuery queryParams); } diff --git a/src/main/java/com/youlai/boot/system/service/NoticeStatusService.java b/src/main/java/com/youlai/boot/system/service/NoticeStatusService.java index 5cd748c6..aae06907 100644 --- a/src/main/java/com/youlai/boot/system/service/NoticeStatusService.java +++ b/src/main/java/com/youlai/boot/system/service/NoticeStatusService.java @@ -34,7 +34,7 @@ public interface NoticeStatusService extends IService { * 分页获取我的通知公告 * @param page 分页对象 * @param queryParams 查询参数 - * @return 通知公告分页列表 + * @return 我的通知公告分页列表 */ - IPage getMyNoticePage(Page page, NoticeQuery queryParams); + IPage getMyNoticePage(Page page, NoticeQuery queryParams); } diff --git a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java index cde91ba8..7a1641d7 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java @@ -269,7 +269,7 @@ public class NoticeServiceImpl extends ServiceImpl impleme * @return 通知公告分页列表 */ @Override - public IPage getMyNoticePage(NoticeQuery queryParams) { + public IPage getMyNoticePage(NoticeQuery queryParams) { Long userId = SecurityUtils.getUserId(); queryParams.setUserId(userId); return noticeStatusService.getMyNoticePage(new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),queryParams); diff --git a/src/main/java/com/youlai/boot/system/service/impl/NoticeStatusServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/NoticeStatusServiceImpl.java index fd54e3e1..2a1599bd 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/NoticeStatusServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/NoticeStatusServiceImpl.java @@ -59,7 +59,7 @@ public class NoticeStatusServiceImpl extends ServiceImpl getMyNoticePage(Page page, NoticeQuery queryParams) { + public IPage getMyNoticePage(Page page, NoticeQuery queryParams) { return this.getBaseMapper().getMyNoticePage(new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),queryParams); } diff --git a/src/main/resources/mapper/NoticeStatusMapper.xml b/src/main/resources/mapper/NoticeStatusMapper.xml index 2a2dd71d..76b706e9 100644 --- a/src/main/resources/mapper/NoticeStatusMapper.xml +++ b/src/main/resources/mapper/NoticeStatusMapper.xml @@ -20,10 +20,11 @@ sn.release_time DESC - SELECT sn.id, sn.title, + sn.notice_type, sn.release_by, sn.priority, sn.release_time,