From 469a106cf617efd2e9fbe02937c355fa392ae7bc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 二月 2026 17:53:07 +0800
Subject: [PATCH] feat: 消息通知添加APP跳转路由
---
src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
index 2d21535..2040850 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.system.service.impl;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -22,6 +23,7 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import com.ruoyi.project.system.domain.SysNotice;
import com.ruoyi.project.system.mapper.SysNoticeMapper;
@@ -50,6 +52,9 @@
@Autowired
@Lazy
private ISysNoticeService sysNoticeService;
+
+ @Autowired
+ private UnipushService unipushService;
/**
* 鏌ヨ鍏憡淇℃伅
@@ -139,20 +144,27 @@
}
@Override
- public void simpleNoticeByUser(String title, String message, List<Long> consigneeId, Long tenantId,
- String jumpPath) {
+ public void simpleNoticeByUser(String title, String message, List<Long> consigneeId, String jumpPath) {
Long userId = SecurityUtils.getLoginUser().getUserId();
- List<SysNotice> sysNotices = consigneeId.stream().map(it -> convertSysNotice(title, message, it,tenantId, jumpPath, userId)).collect(Collectors.toList());
+ Long tenantId = SecurityUtils.getLoginUser().getTenantId();
+ List<SysNotice> sysNotices = consigneeId.stream()
+ .map(it -> convertSysNotice(title, message, it, tenantId, jumpPath, unipushService.convertWebPathToAppPath(jumpPath), userId))
+ .collect(Collectors.toList());
sysNoticeService.saveBatch(sysNotices);
+ try {
+ unipushService.sendClientMessage(sysNotices);
+ } catch (Exception e) {
+ log.error("APP鎺ㄩ�侀�氱煡澶辫触锛屽師鍥�: {}", e);
+ }
}
@Override
- public void simpleNoticeAll(String title, String message, Long rootDeptId, String jumpPath) {
+ public void simpleNoticeAll(String title, String message, String jumpPath) {
Long userId = SecurityUtils.getLoginUser().getUserId();
if (userId == null) {
return;
}
-
+ Long rootDeptId = SecurityUtils.getLoginUser().getTenantId();
// 鏌ユ墍鏈夊瓙閮ㄩ棬
List<SysDept> childrenDepts = deptMapper.selectChildrenDeptById(rootDeptId);
@@ -190,15 +202,21 @@
it.getUserId(),
it.getTenantId(),
jumpPath,
+ unipushService.convertWebPathToAppPath(jumpPath),
userId
))
.collect(Collectors.toList());
sysNoticeService.saveBatch(collect);
+ try {
+ unipushService.sendClientMessage(collect);
+ } catch (Exception e) {
+ log.error("APP鎺ㄩ�侀�氱煡澶辫触锛屽師鍥�: {}", e);
+ }
}
- private SysNotice convertSysNotice(String title,String message,Long consigneeId, Long tenantId,String jumpPath,Long currentUserId) {
+ private SysNotice convertSysNotice(String title,String message,Long consigneeId, Long tenantId,String jumpPath,String appJumpPath,Long currentUserId) {
SysNotice sysNotice = new SysNotice();
sysNotice.setNoticeType("1");
sysNotice.setNoticeTitle(title);//鏍囬
@@ -207,7 +225,9 @@
sysNotice.setConsigneeId(consigneeId);
sysNotice.setSenderId(currentUserId);
sysNotice.setJumpPath(jumpPath);
+ sysNotice.setAppJumpPath(appJumpPath);
sysNotice.setTenantId(tenantId);
return sysNotice;
}
+
}
--
Gitblit v1.9.3