From 5393e1b43f7148adc93dd5a29f7b6fd4a054eec6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 六月 2025 16:13:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ExgMsgService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ExgMsgService.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ExgMsgService.java
index b178aa4..ea9ab1d 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ExgMsgService.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/ExgMsgService.java
@@ -55,7 +55,7 @@
public void up_exg_msg(ChannelHandlerContext ctx, OuterPacket out) {
if (!redisTemplate.hasKey("login:" + out.getGnsscenterId())) {
- log.error("链路还未登录校验，拒绝连接");
+ log.error("链路还未登录校验，拒绝连接：{}", out.getGnsscenterId());
ctx.close();
return;
}
@@ -177,7 +177,7 @@
downExgMsgReportDriverInfo.setDataType(DataType.DOWN_EXG_MSG_REPORT_DRIVER_INFO.getCode());
downExgMsgReportDriverInfo.setDataLength(0);
byte[] body = downExgMsgReportDriverInfo.encode();
- OuterPacket out = new OuterPacket(DataType.DOWN_EXG_MSG.getCode(), body);
+ OuterPacket out = new OuterPacket(DataType.DOWN_EXG_MSG.getCode(), inferiorPlatformId, body);
//获取从链路通道
Channel channel = ChannelMap.getClientChannel(inferiorPlatformId);
if (null != channel && channel.isActive()) {
@@ -228,7 +228,7 @@
*/
public void down_exg_msg_take_ewaybill_req(int inferiorPlatformId, String vehicleNo, int VehicleColor) {
if (!redisTemplate.hasKey("login:" + inferiorPlatformId)) {
- log.error("链路还未登录校验，拒绝连接");
+ log.error("链路还未登录校验，拒绝连接：{}", inferiorPlatformId);
return;
}
DOWNExgMsgTakeEwaybillReq downExgMsgTakeEwaybillReq = new DOWNExgMsgTakeEwaybillReq();
@@ -238,7 +238,7 @@
downExgMsgTakeEwaybillReq.setDataLength(0);
byte[] body = downExgMsgTakeEwaybillReq.encode();
- OuterPacket out = new OuterPacket(DataType.DOWN_EXG_MSG.getCode(), body);
+ OuterPacket out = new OuterPacket(DataType.DOWN_EXG_MSG.getCode(), inferiorPlatformId, body);
//获取从链路通道
Channel channel = ChannelMap.getClientChannel(inferiorPlatformId);
if (null != channel && channel.isActive()) {
@@ -314,7 +314,7 @@
*/
public void down_base_msg_vehicle_added(int inferiorPlatformId, String vehicleNo, int VehicleColor) {
if (!redisTemplate.hasKey("login:" + inferiorPlatformId)) {
- log.error("链路还未登录校验，拒绝连接");
+ log.error("链路还未登录校验，拒绝连接：{}", inferiorPlatformId);
return;
}
DOWNBaseMsgVehicleAdded downBaseMsgVehicleAdded = new DOWNBaseMsgVehicleAdded();
@@ -324,7 +324,7 @@
downBaseMsgVehicleAdded.setDataLength(0);
byte[] body = downBaseMsgVehicleAdded.encode();
- OuterPacket out = new OuterPacket(DataType.DOWN_BASE_MSG.getCode(), body);
+ OuterPacket out = new OuterPacket(DataType.DOWN_BASE_MSG.getCode(), inferiorPlatformId, body);
//获取从链路通道
Channel channel = ChannelMap.getClientChannel(inferiorPlatformId);
if (null != channel && channel.isActive()) {
--
Gitblit v1.7.1