From 7722f4f685bca2f452dc98f64cf6adac589f8b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 26 Mar 2026 18:05:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=85=AC=E5=91=8A=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=A2=84=E8=A7=88=E5=B7=B2=E7=BB=8F=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=A5=BD=E7=9A=84=E5=AF=8C=E6=96=87=E6=9C=AC=E5=86=85?= =?UTF-8?q?=E5=AE=B9=20update=20=E4=BC=98=E5=8C=96=20=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9B=92=E5=AD=90=E7=9B=B8=E5=85=B3=E6=B6=88=E6=81=AF=E5=8F=AF?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BD=AC=E5=88=B0=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E5=B1=95=E7=A4=BA=E5=AF=8C=E6=96=87=E6=9C=AC=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/common/core/domain/dto/PushPayload.java | 9 +-------- .../system/controller/system/SysNoticeController.java | 4 ++-- .../system/service/impl/SysNoticeServiceImpl.java | 4 +++- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PushPayload.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PushPayload.java index 1088ec118..882f2fb3c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PushPayload.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PushPayload.java @@ -7,7 +7,6 @@ import org.dromara.common.core.utils.StringUtils; import java.io.Serial; import java.io.Serializable; -import java.util.Map; /** * 推送给前端的统一消息体 @@ -45,11 +44,6 @@ public class PushPayload implements Serializable { */ private String path; - /** - * 前端跳转参数 - */ - private Map query; - /** * 时间戳 */ @@ -74,10 +68,9 @@ public class PushPayload implements Serializable { ); } - public static PushPayload of(PushTypeEnum type, PushSourceEnum source, String message, Object data, String path, Map query) { + public static PushPayload of(PushTypeEnum type, PushSourceEnum source, String message, Object data, String path) { PushPayload payload = of(type, source, message, data); payload.setPath(path); - payload.setQuery(query); return payload; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java index 53ec668c4..2b400e260 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java @@ -82,13 +82,13 @@ public class SysNoticeController extends BaseController { data.put("noticeType", notice.getNoticeType()); data.put("noticeTypeLabel", type); data.put("noticeTitle", notice.getNoticeTitle()); + data.put("noticeId", notice.getNoticeId()); PushHelper.publishAll(PushPayload.of( PushTypeEnum.NOTICE, PushSourceEnum.NOTICE, "[" + type + "] " + notice.getNoticeTitle(), data, - "/system/notice", - null + "/system/notice?noticeId=" + notice.getNoticeId() )); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java index 2cdb7ba07..f201e4fa9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java @@ -98,7 +98,9 @@ public class SysNoticeServiceImpl implements ISysNoticeService { @Override public int insertNotice(SysNoticeBo bo) { SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); - return baseMapper.insert(notice); + int rows = baseMapper.insert(notice); + bo.setNoticeId(notice.getNoticeId()); + return rows; } /**