From 50864934bd29f13e6014d566630e14a1e8021f19 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 08 五月 2024 13:54:58 +0800
Subject: [PATCH] 1、全部实现王江海制定的协议,但还未联调; 2、通信中间件软件工程改名称为pipIrr-mw-rtu;

---
 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