From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 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 d04239f..3fc9475 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
@@ -17,6 +17,7 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -32,6 +33,7 @@
*
* @author ruoyi
*/
+@Slf4j
@Service
@RequiredArgsConstructor
public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
@@ -159,14 +161,10 @@
Long userId = SecurityUtils.getLoginUser().getUserId();
Long tenantId = SecurityUtils.getLoginUser().getTenantId();
List<SysNotice> sysNotices = consigneeId.stream()
- .map(it -> convertSysNotice(title, message, it, tenantId, jumpPath, unipushService.convertWebPathToAppPath(jumpPath), userId))
+ .map(it -> convertSysNotice(title, message, it, tenantId, jumpPath, jumpPath, userId))
.collect(Collectors.toList());
noticeMapper.insert(sysNotices);
- try {
- unipushService.sendClientMessage(sysNotices);
- } catch (Exception e) {
- log.error("APP鎺ㄩ�侀�氱煡澶辫触锛屽師鍥�: {}", e);
- }
+ log.info("鍏憡宸蹭繚瀛樿嚦鏁版嵁搴擄紝鎺ㄩ�佸姛鑳藉凡绂佺敤");
}
@Override
@@ -213,16 +211,12 @@
it.getUserId(),
it.getTenantId(),
jumpPath,
- unipushService.convertWebPathToAppPath(jumpPath),
+ jumpPath,
userId
))
.collect(Collectors.toList());
noticeMapper.insert(collect);
- try {
- unipushService.sendClientMessage(collect);
- } catch (Exception e) {
- log.error("APP鎺ㄩ�侀�氱煡澶辫触锛屽師鍥�: {}", e);
- }
+ log.info("鍏憡宸蹭繚瀛樿嚦鏁版嵁搴擄紝鎺ㄩ�佸姛鑳藉凡绂佺敤");
}
--
Gitblit v1.9.3