From ee6e575076ba17c1fc8f4ba33253b7ea0fba45f8 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 30 十一月 2023 10:25:04 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpConnect/MinaConnect.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java
similarity index 69%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpConnect/MinaConnect.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java
index 2d85f19..cdf2c8e 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpConnect/MinaConnect.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java
@@ -1,38 +1,44 @@
-package com.dy.testClient.tcpConnect;
+package com.dy.testClient.tcpClient;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.session.IoSession;
-
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.transport.socket.SocketConnector;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import java.net.InetSocketAddress;
-public class MinaConnect {
+public class TcpConnect {
+
+ public static final String rtuAddrKey = "rtuAddr" ;
+ public static final String threadJobKey = "threadJob" ;
/**
* 鍒ゆ柇浼氳瘽鏄惁鏈夋晥
* @param se 缃戠粶浼氳瘽
* @return 鏄惁杩炴帴
*/
- protected boolean isConnected(IoSession se) {
+ public boolean isConnected(IoSession se) {
return (se != null && se.isConnected());
}
/**
* 鍒涘缓鏂颁細璇�
+ * @param rtuAddr rtu鍦板潃
+ * @param job rtu宸ヤ綔绫�
* @param host 鏈嶅姟鍣║RI
* @param port 鏈嶅姟鍣ㄧ鍙�
* @return 缃戠粶浼氳瘽
*/
- protected IoSession createSession(String host , int port , int connectTimeout , MinaHandler handler) throws Exception{
+ public IoSession createSession(String rtuAddr, MyThreadJob job, String host , int port , int connectTimeout , TcpHandler handler) throws Exception{
SocketConnector connector = new NioSocketConnector();
connector.getFilterChain().addLast("codec", new ProtocolCodecFilter(new LocalCodecFactory()));
connector.setHandler(handler);
ConnectFuture connectFuture = connector.connect(new InetSocketAddress(host, port));
connectFuture.awaitUninterruptibly(connectTimeout);
IoSession se = connectFuture.getSession();
+ se.setAttribute(rtuAddrKey, rtuAddr) ;
+ se.setAttribute(threadJobKey, job) ;
return se ;
}
@@ -42,7 +48,7 @@
* @param se
* @param connectTimeout
*/
- protected void disconnect(IoSession se , int connectTimeout) {
+ public void disconnect(IoSession se , int connectTimeout) {
if (se != null) {
try{
se.closeNow().awaitUninterruptibly(connectTimeout);
--
Gitblit v1.8.0