From f8a708d9d960db750c9dd029efbe4a9f63d53fe8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 四月 2025 13:51:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ConnectReqService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ConnectReqService.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ConnectReqService.java
index 389285a..f6ab282 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ConnectReqService.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ConnectReqService.java
@@ -72,7 +72,7 @@
//主链路登录应答
log.info("主链路登录应答({})：{}", DataType.UP_CONNECT_RSP.getCode(), JSON.toJSONString(upConnectRsp));
byte[] body = upConnectRsp.encode();
- OuterPacket out = new OuterPacket(DataType.UP_CONNECT_RSP.getCode(), body);
+ OuterPacket out = new OuterPacket(DataType.UP_CONNECT_RSP.getCode(),outerPacket.getGnsscenterId() , body);
ctx.writeAndFlush(out);
ctx.flush();
if (upConnectRsp.getResult() == 0x00) {
@@ -98,7 +98,7 @@
try {
boolean b = downConnect(inferiorPlatformId, host, port, verifyCode);
} catch (Exception e) {
- downDisconnectInform(ctx, 0x00);
+ downDisconnectInform(ctx, inferiorPlatformId, 0x00);
throw new RuntimeException(e);
}
}
@@ -140,12 +140,12 @@
* @param ctx
* @param errorCode
*/
- public void downDisconnectInform(ChannelHandlerContext ctx, int errorCode) {
+ public void downDisconnectInform(ChannelHandlerContext ctx, int inferiorPlatformId, int errorCode) {
DOWNDisconnectInform downDisconnectInform = new DOWNDisconnectInform();
downDisconnectInform.setErrorCode(errorCode);
log.info("从链路断开通知({})：{}", DataType.DOWN_DISCONNECT_INFORM.getCode(), JSON.toJSONString(downDisconnectInform));
byte[] body = downDisconnectInform.encode();
- OuterPacket out = new OuterPacket(DataType.DOWN_CONNECT_REQ.getCode(), body);
+ OuterPacket out = new OuterPacket(DataType.DOWN_CONNECT_REQ.getCode(), inferiorPlatformId, body);
ctx.writeAndFlush(out);
ctx.flush();
}
--
Gitblit v1.7.1