diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index eac8042..220b3c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -3,6 +3,8 @@ package com.ruoyi.web.controller.system; import java.util.Date; import java.util.List; +import com.mysql.cj.protocol.x.Notice; +import com.ruoyi.common.constant.UserConstants; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,7 +43,12 @@ public class SysNoticeController extends BaseController { return prefix + "/notice"; } - + @RequiresPermissions("system:notice:view") + @GetMapping("/notice2") + public String notice2() + { + return prefix + "/notice2"; + } /** * 查询公告列表 */ @@ -65,6 +72,9 @@ public class SysNoticeController extends BaseController public String detail(@PathVariable Long noticeId, ModelMap mmap) { SysNotice notice = noticeService.selectNoticeById(noticeId); + // 阅读状态 + notice.setReadStatus("1"); + noticeService.updateNotice(notice); mmap.put("notice", notice); return prefix + "/detail"; } @@ -127,4 +137,15 @@ public class SysNoticeController extends BaseController { return toAjax(noticeService.deleteNoticeByIds(ids)); } + + @GetMapping("/unreadCount") + @ResponseBody + public int getUnreadNoticeCount() { + SysNotice notice = new SysNotice(); + notice.setUserId(getSysUser().getUserId()); + notice.setReadStatus("0"); + notice.setNoticeType("1"); + List list = noticeService.selectNoticeList(notice); + return list.size(); + } } diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 9c7e153..3f19002 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -15,6 +15,49 @@ +
@@ -193,6 +236,15 @@