From 7342170db7dc39326698d39b74e1858502fd574a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 13 八月 2025 15:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java b/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
index c39c8c9..f149d08 100644
--- a/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
+++ b/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
@@ -27,15 +27,15 @@
*/
@ResponseBody
@PostMapping("/sendMsgToClient")
- public String sendMsgToClient(Integer id, Integer type, String msg){
+ public String sendMsgToClient(Integer id, Integer type, String msg,String bussinessType){
System.out.println("推送参数：" + id + "---" + type + "---" + msg);
if(type == 1){//用户端
- ChannelHandlerContext channel = NettyChannelMap.getData("Applets" + id);//小程序
+ ChannelHandlerContext channel = NettyChannelMap.getData(bussinessType+":Applets" + id);//小程序
if(null != channel){
NettyWebSocketController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
}
- channel = NettyChannelMap.getData("USER" + id);
+ channel = NettyChannelMap.getData(bussinessType+":USER" + id);
if(null != channel){
NettyServerController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
@@ -46,7 +46,7 @@
if(type == 2){//司机端
System.out.println("长链接实例：" + JSON.toJSONString(NettyChannelMap.map));
- ChannelHandlerContext channel = NettyChannelMap.getData("DRIVER" + id);
+ ChannelHandlerContext channel = NettyChannelMap.getData(bussinessType+":DRIVER" + id);
if(null != channel){
NettyServerController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
--
Gitblit v1.7.1