From 7a4f61cf5e8d42d24907ccc3d7345d25012d3a55 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 14 Apr 2026 16:43:50 +0800
Subject: [PATCH] 通知公告新增阅读用户&详细
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
index 519fadf..3ae141a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
@@ -2,7 +2,6 @@
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -11,14 +10,18 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.service.ISysNoticeReadService;
import com.ruoyi.system.service.ISysNoticeService;
/**
@@ -33,10 +36,13 @@
@Autowired
private ISysNoticeService noticeService;
+ @Autowired
+ private ISysNoticeReadService noticeReadService;
+
/**
* 获取通知公告列表
*/
- @PreAuthorize("@ss.hasPermi('system:notice:list')")
+ @RequiresPermissions("system:notice:list")
@GetMapping("/list")
public TableDataInfo list(SysNotice notice)
{
@@ -48,18 +54,17 @@
/**
* 根据通知公告编号获取详细信息
*/
- @PreAuthorize("@ss.hasPermi('system:notice:query')")
@GetMapping(value = "/{noticeId}")
public AjaxResult getInfo(@PathVariable Long noticeId)
{
- return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+ return success(noticeService.selectNoticeById(noticeId));
}
/**
* 新增通知公告
*/
- @PreAuthorize("@ss.hasPermi('system:notice:add')")
- @Log(title = "通知公告", businessType = BusinessType.UPDATE)
+ @RequiresPermissions("system:notice:add")
+ @Log(title = "通知公告", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysNotice notice)
{
@@ -70,7 +75,7 @@
/**
* 修改通知公告
*/
- @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+ @RequiresPermissions("system:notice:edit")
@Log(title = "通知公告", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysNotice notice)
@@ -80,13 +85,67 @@
}
/**
+ * 首页顶部公告列表（返回全部正常公告，带当前用户已读标记，最多5条）
+ */
+ @GetMapping("/listTop")
+ @ResponseBody
+ public AjaxResult listTop()
+ {
+ Long userId = SecurityUtils.getUserId();
+ List<SysNotice> list = noticeReadService.selectNoticeListWithReadStatus(userId, 5);
+ long unreadCount = list.stream().filter(n -> !n.getIsRead()).count();
+ AjaxResult result = AjaxResult.success(list);
+ result.put("unreadCount", unreadCount);
+ return result;
+ }
+
+ /**
+ * 标记公告已读
+ */
+ @PostMapping("/markRead")
+ @ResponseBody
+ public AjaxResult markRead(Long noticeId)
+ {
+ Long userId = SecurityUtils.getUserId();
+ noticeReadService.markRead(noticeId, userId);
+ return success();
+ }
+
+ /**
+ * 批量标记已读
+ */
+ @PostMapping("/markReadAll")
+ @ResponseBody
+ public AjaxResult markReadAll(String ids)
+ {
+ Long userId = SecurityUtils.getUserId();
+ Long[] noticeIds = Convert.toLongArray(ids);
+ noticeReadService.markReadBatch(userId, noticeIds);
+ return success();
+ }
+
+ /**
+ * 已读用户列表数据
+ */
+ @RequiresPermissions("system:notice:list")
+ @GetMapping("/readUsers/list")
+ @ResponseBody
+ public TableDataInfo readUsersList(Long noticeId, String searchValue)
+ {
+ startPage();
+ List<?> list = noticeReadService.selectReadUsersByNoticeId(noticeId, searchValue);
+ return getDataTable(list);
+ }
+
+ /**
* 删除通知公告
*/
- @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+ @RequiresPermissions("system:notice:remove")
@Log(title = "通知公告", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}")
public AjaxResult remove(@PathVariable Long[] noticeIds)
{
+ noticeReadService.deleteByNoticeIds(noticeIds);
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}
}
--
Gitblit v1.9.3