From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 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 c0decdf..f149d08 100644
--- a/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
+++ b/MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
@@ -18,11 +18,6 @@
@RequestMapping("/netty")
public class NettyController {
- @Autowired
- private NettyServerController nettyServerController;
-
- @Autowired
- private NettyWebSocketController nettyWebSocketController;
/**
@@ -32,16 +27,17 @@
*/
@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);
+ 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);
+ NettyServerController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
}
return JSON.toJSONString(ResultUtil.error("推送失败-----用户id=" + id));
@@ -49,9 +45,10 @@
}
if(type == 2){//司机端
- ChannelHandlerContext channel = NettyChannelMap.getData("DRIVER" + id);
+ System.out.println("长链接实例：" + JSON.toJSONString(NettyChannelMap.map));
+ ChannelHandlerContext channel = NettyChannelMap.getData(bussinessType+":DRIVER" + id);
if(null != channel){
- nettyServerController.sendMsgToClient(channel, msg);
+ NettyServerController.sendMsgToClient(channel, msg);
return JSON.toJSONString(ResultUtil.success());
}
return JSON.toJSONString(ResultUtil.error("推送失败-----司机id=" + id));
--
Gitblit v1.7.1