From 400c712a036e97878fe63944ed2cfba303ab178c Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 14:23:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_web/src/main/java/com/doumee/api/web/NoticeApi.java | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 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..a3ce84f 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,12 @@
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;
@@ -19,14 +15,13 @@
@Api(tags = "娑堟伅閫氱煡淇′笟鍔�")
@Trace(exclude = true)
-@LoginRequired
@RestController
@RequestMapping("/web/notice")
@Slf4j
public class NoticeApi extends ApiController{
@Autowired
- private NoticeService noticeService;
+ private NoticesService noticeService;
/**
@@ -34,25 +29,13 @@
* @param pageWrap
* @return
*/
- @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 +46,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);
@@ -71,11 +54,10 @@
}
- @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