From 8f7bec9854a2d1a5bf10a5fe2350be0c39529896 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <zsthesai>
Date: Mon, 20 Mar 2023 14:09:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=8F=E4=BC=A0=E6=9C=8D=E5=8A=A1bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9-by=20=E5=8D=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/real/afctransfer/AfcMessageHandler.java   | 12 ++++--------
 .../device/real/afctransfer/AfcTransferServer.java   |  6 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/afctransfer/AfcMessageHandler.java b/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/afctransfer/AfcMessageHandler.java
index 7c00a1e37..32d94c895 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/afctransfer/AfcMessageHandler.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/afctransfer/AfcMessageHandler.java
@@ -2,20 +2,14 @@ package club.joylink.rtss.simulation.cbtc.device.real.afctransfer;
 
 import club.joylink.rtss.simulation.cbtc.device.real.modbustcp.PlcGatewayConnectManager;
 import club.joylink.rtss.simulation.cbtc.device.real.modbustcp.handler.ModbusMessageHandler2;
-import com.digitalpetri.modbus.FunctionCode;
-import com.digitalpetri.modbus.codec.ModbusResponseDecoder;
 import com.digitalpetri.modbus.codec.ModbusTcpPayload;
-import com.digitalpetri.modbus.requests.*;
-import com.digitalpetri.modbus.responses.*;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
+import com.digitalpetri.modbus.responses.ModbusResponse;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueue;
 import lombok.extern.slf4j.Slf4j;
 
-import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -69,7 +63,8 @@ public class AfcMessageHandler extends SimpleChannelInboundHandler<ModbusTcpPayl
                                 try {
                                     // 获取网关消息并回写给AFC客户端
                                     ModbusResponse payload = future.get();
-                                    query.getChannel().writeAndFlush(payload);
+                                    query.getChannel().writeAndFlush(new ModbusTcpPayload(query.getPayload().getTransactionId(), query.getPayload().getUnitId(), payload));
+                                    log.info("回复AFC客户端请求");
                                 } catch (Exception e) {
                                     log.error("获取AFC网关响应异常", e);
                                 }
@@ -95,6 +90,7 @@ public class AfcMessageHandler extends SimpleChannelInboundHandler<ModbusTcpPayl
         }
         synchronized (AfcQueryQueue) {
             // 生产客户端查询记录
+            log.info("收到AFC客户端请求");
             AfcQueryQueue.offer(new AfcClientQuery(ctx.channel(), msg));
             AfcQueryQueue.notify();
         }
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/afctransfer/AfcTransferServer.java b/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/afctransfer/AfcTransferServer.java
index 481102ae7..085b8d947 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/afctransfer/AfcTransferServer.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/device/real/afctransfer/AfcTransferServer.java
@@ -3,8 +3,9 @@ package club.joylink.rtss.simulation.cbtc.device.real.afctransfer;
 import club.joylink.rtss.configuration.configProp.ModbusTcpConfig;
 import club.joylink.rtss.simulation.cbtc.device.real.modbustcp.PlcGatewayConnectManager;
 import club.joylink.rtss.simulation.cbtc.device.real.modbustcp.handler.ModbusMessageHandler2;
-import club.joylink.rtss.simulation.cbtc.device.real.modbustcp.handler.RegisterHandler2;
-import com.digitalpetri.modbus.codec.*;
+import com.digitalpetri.modbus.codec.ModbusRequestDecoder;
+import com.digitalpetri.modbus.codec.ModbusResponseEncoder;
+import com.digitalpetri.modbus.codec.ModbusTcpCodec;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.*;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -46,7 +47,6 @@ public class AfcTransferServer implements ApplicationRunner {
                     @Override
                     public void initChannel(SocketChannel ch) throws Exception {
                         ChannelPipeline pipeline = ch.pipeline();
-//                        pipeline.addLast(new ModbusTcpCodec(new ModbusRequestEncoder(), new ModbusResponseDecoder()));
                         pipeline.addLast(new ModbusTcpCodec(new ModbusResponseEncoder(), new ModbusRequestDecoder()));
                         pipeline.addLast(new AfcMessageHandler(plcGatewayConnectManager, modbusMessageHandler));
                     }