Merge remote-tracking branch 'origin/master'

nidapeng

2024-05-06 400c712a036e97878fe63944ed2cfba303ab178c

 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));
    }

}