diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsNoticeController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsNoticeController.java index 9a604c5..e5fead5 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsNoticeController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsNoticeController.java @@ -5,6 +5,7 @@ import com.ruoyi.cms.domain.Notice; import com.ruoyi.cms.service.IAppNoticeService; import com.ruoyi.cms.service.IAppUserService; import com.ruoyi.cms.util.RoleUtils; +import com.ruoyi.cms.util.StringUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.controller.BaseController; @@ -134,6 +135,28 @@ public class CmsNoticeController extends BaseController return getDataTable(notices); } + @ApiOperation("pc端获已读消息列表") + @GetMapping("/appNoticYdList") + public TableDataInfo appNoticYdList(Notice notice) + { + if(!SecurityUtils.isLogin()){ + error(HttpStatus.ERROR,"未登录!"); + } + if(notice.getUserId()==null){ + String idCard= RoleUtils.getCurrentUseridCard(); + AppUser appUser=appUserService.selectAppuserByIdcard(idCard); + if(appUser==null){ + error(HttpStatus.ERROR,"用户信息未完善,请完善身份证信息!"); + }else{ + notice.setUserId(appUser.getUserId()); + } + } + startPage(); + notice.setIsRead(StringUtil.NOTICE_YD); + List notices = noticeService.selectListAppNotices(notice); + return getDataTable(notices); + } + @ApiOperation("系统通知标记已读") @PostMapping("/read/sysNotice") public AjaxResult sysNotice(@RequestParam String id) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppNoticeService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppNoticeService.java index c8e2d1c..de77a9c 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppNoticeService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppNoticeService.java @@ -82,4 +82,11 @@ public interface IAppNoticeService void readSysNotices(String ids,Long userId); List selectListAppNotics(Notice notice); + + /** + * 获取消息列表 + * @param notice + * @return + */ + List selectListAppNotices(Notice notice); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppNoticeServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppNoticeServiceImpl.java index cfaa9af..9febbd5 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppNoticeServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppNoticeServiceImpl.java @@ -229,5 +229,9 @@ public class AppNoticeServiceImpl implements IAppNoticeService notice.setRemark(StringUtil.NOTICE_TYPE); return noticeInfoMapper.getNoticlist(notice); } + + public List selectListAppNotices(Notice notice){ + return noticeInfoMapper.getNoticlist(notice); + } }