From 70aeac289c132085e91d59dc82bc1facd41889fa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 24 二月 2025 15:33:53 +0800
Subject: [PATCH] 有关表阀一体机（王江海制定）通信协议： 1、根据新版本协议，解析部分更新； 2、根据测试一体阀协议数据处理需求与逻辑，进行表阀一体机数据处理。
---
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java
index cdf2c8e..a4dae41 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java
@@ -1,5 +1,6 @@
package com.dy.testClient.tcpClient;
+import com.dy.common.util.Callback;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
@@ -28,9 +29,18 @@
* @param job rtu宸ヤ綔绫�
* @param host 鏈嶅姟鍣║RI
* @param port 鏈嶅姟鍣ㄧ鍙�
+ * @param connectTimeout 杩炴帴瓒呮椂鏃堕暱
+ * @param handler 鏁版嵁澶勭悊鑰�
+ * @param callback 鍥炶皟
* @return 缃戠粶浼氳瘽
*/
- public IoSession createSession(String rtuAddr, MyThreadJob job, String host , int port , int connectTimeout , TcpHandler handler) throws Exception{
+ public void createSession(String rtuAddr,
+ MyThreadJob job,
+ String host ,
+ int port ,
+ int connectTimeout ,
+ TcpHandler handler,
+ Callback callback) throws Exception{
SocketConnector connector = new NioSocketConnector();
connector.getFilterChain().addLast("codec", new ProtocolCodecFilter(new LocalCodecFactory()));
connector.setHandler(handler);
@@ -39,7 +49,7 @@
IoSession se = connectFuture.getSession();
se.setAttribute(rtuAddrKey, rtuAddr) ;
se.setAttribute(threadJobKey, job) ;
- return se ;
+ callback.call(se) ;
}
--
Gitblit v1.8.0