From a4d3ac72a1d250517dcbc554aea4f09e505b7171 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 05 三月 2026 14:03:20 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New
---
src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java b/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java
index 3de2b9e..a6e97f4 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java
@@ -80,16 +80,19 @@
log.warn("鐢ㄦ埛 {} 鏈粦瀹氱Щ鍔ㄧ CID,璺宠繃鎺ㄩ��", sysNotice.getConsigneeId());
continue;
}
-
// 杞崲璺緞
String appPath = convertWebPathToAppPath(sysNotice.getJumpPath());
+ String content = sysNotice.getNoticeContent();
+ if (StringUtils.isNotEmpty(sysNotice.getRemark())) {
+ content = content + " " + sysNotice.getRemark();
+ }
// 鎺ㄩ��
sendRoutingPush(
sysNotice.getNoticeId(),
client.getCid(),
sysNotice.getNoticeTitle(),
- sysNotice.getRemark() != null ? sysNotice.getRemark() : sysNotice.getNoticeContent(),
+ content,
appPath
);
}
@@ -118,31 +121,41 @@
} else {
lastSegment = pathOnly;
}
-
if (StringUtils.isEmpty(lastSegment)) {
return DEFAULT_APP_PAGE;
}
SysMenu menu = sysMenuMapper.selectMenuByPath(lastSegment);
-
if (menu != null && StringUtils.isNotEmpty(menu.getAppComponent())) {
String appPath = menu.getAppComponent();
-
if (appPath.startsWith("/")) {
appPath = appPath.substring(1);
}
-
// 鎷兼帴 Web 绔師濮嬪弬鏁板苟杩斿洖
return appPath + queryString;
}
-
return DEFAULT_APP_PAGE;
+ }
+
+ /**
+ * 鍙戦�佸洖璁挎彁閱�
+ */
+ public void sendReturnVisitReminder(Long returnVisitId, String cid, String content, Integer customerId) {
+ String targetPath = "pages/cooperativeOffice/customerManage/detail?customerId=" + customerId;
+ sendRoutingPush(returnVisitId, cid, "瀹㈡埛鍥炶鎻愰啋", content, targetPath, false);
}
/**
* 鍙戦�佸崟浜鸿矾鐢辨帹閫�
*/
private void sendRoutingPush(Long noticeId, String cid, String title, String content, String targetPath) {
+ sendRoutingPush(noticeId, cid, title, content, targetPath, true);
+ }
+
+ /**
+ * 鍙戦�佸崟浜鸿矾鐢辨帹閫�
+ */
+ private void sendRoutingPush(Long noticeId, String cid, String title, String content, String targetPath, boolean needMarkRead) {
log.info("鍑嗗鎺ㄩ�佹秷鎭�:NoticeId={}, CID={}, Title={}, TargetPath={}", noticeId, cid, title, targetPath);
PushDTO<Audience> pushDTO = new PushDTO<>();
@@ -156,6 +169,7 @@
pushMessageMap.put("content", content);
payloadMap.put("url", targetPath);
payloadMap.put("noticeId", noticeId);
+ payloadMap.put("needMarkRead", needMarkRead);
pushMessageMap.put("payload", JSON.toJSONString(payloadMap));
String transmissionContent = JSON.toJSONString(pushMessageMap);
--
Gitblit v1.9.3