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; } /**