From 827b2160094482c075968b74e6b69284e7c6eb80 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期三, 24 四月 2024 17:00:01 +0800 Subject: [PATCH] 最新版本 --- server/meeting/meeting_web/src/main/java/com/doumee/api/web/NoticeApi.java | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/NoticeApi.java b/server/meeting/meeting_web/src/main/java/com/doumee/api/web/NoticeApi.java index 4429981..1d080df 100644 --- a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/NoticeApi.java +++ b/server/meeting/meeting_web/src/main/java/com/doumee/api/web/NoticeApi.java @@ -1,16 +1,13 @@ package com.doumee.api.web; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.doumee.config.annotation.LoginRequired; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; -import com.doumee.dao.business.model.Notice; -import com.doumee.dao.web.request.NoticeCardRequest; -import com.doumee.dao.web.response.NoticeCardResponse; -import com.doumee.service.business.NoticeService; +import com.doumee.dao.system.model.Notices; +import com.doumee.service.system.NoticesService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -26,7 +23,7 @@ public class NoticeApi extends ApiController{ @Autowired - private NoticeService noticeService; + private NoticesService noticeService; /** @@ -37,22 +34,11 @@ @LoginRequired @ApiOperation(value = "鏌ヨ鐢ㄦ埛閫氱煡", notes = "灏忕▼搴忕") @PostMapping("/findNoticePage") - public ApiResponse<IPage<NoticeCardResponse>> findNoticePage(@RequestBody PageWrap<NoticeCardRequest> pageWrap){ - pageWrap.getModel().setMemberId(getMemberId()); - return ApiResponse.success("鏌ヨ鎴愬姛",noticeService.noticePage(pageWrap)); + public ApiResponse<PageData<Notices>> findNoticePage(@RequestBody PageWrap<Notices> pageWrap){ + pageWrap.getModel().setUserId(getMemberId()); + return ApiResponse.success("鏌ヨ鎴愬姛",noticeService.findPage(pageWrap)); } - /** - * 鏌ヨ鏈�鏂扮郴缁熼�氱煡 - * @return - */ - @LoginRequired - @ApiOperation(value = "鏌ヨ鏈�鏂扮郴缁熼�氱煡", notes = "灏忕▼搴忕") - @GetMapping("/findNewNotice") - public ApiResponse<NoticeCardResponse> findNewNotice(){ - - return ApiResponse.success("鏌ヨ鎴愬姛",noticeService.newNotice(getMemberId())); - } /** @@ -63,7 +49,7 @@ @ApiOperation(value = "鐢ㄦ埛鏇存柊闃呰鐘舵��", notes = "灏忕▼搴忕") @GetMapping("/getMemberDTO") public ApiResponse hasRead(@RequestParam Integer id){ - Notice notice = new Notice(); + Notices notice = new Notices(); notice.setId(id); notice.setStatus(Constants.ONE); noticeService.updateById(notice); @@ -74,8 +60,8 @@ @LoginRequired @ApiOperation(value = "鏌ヨ閫氱煡璇︽儏", notes = "灏忕▼搴忕") @GetMapping("/getNoticeDetail") - public ApiResponse<NoticeCardResponse> getNoticeDetail(@RequestParam Integer id){ - return ApiResponse.success("鏌ヨ鎴愬姛",noticeService.getNoticeDetail(id)); + public ApiResponse<Notices> getNoticeDetail(@RequestParam Integer id){ + return ApiResponse.success("鏌ヨ鎴愬姛",noticeService.findById(id)); } } -- Gitblit v1.9.3