From e7efb53cd598bef3413944f294bfffcb1f65f5e9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 09 九月 2025 16:27:51 +0800
Subject: [PATCH] 完善代码

---
 /dev/null                                                                                                  |   13 ------
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCache.java      |    6 +-
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java                 |    2 -
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java                 |    6 +-
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java             |   10 ++--
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/DataDecoder.java                  |    6 +-
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpUnit.java                      |    6 +-
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpIoSessionCallback.java |   10 ++--
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailableHandleImp.java  |   10 ++--
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrKeys.java         |   13 ++++++
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java       |    6 +-
 11 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/DataDecoder.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/DataDecoder.java
index 3508fcd..389e378 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/DataDecoder.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/DataDecoder.java
@@ -29,7 +29,7 @@
 	 */
 	@Override
 	protected boolean doDecode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) {
-		String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrRtuAddr) ;
+		String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrKeys.sessionAttrRtuAddr) ;
 		if(rtuAddr == null){
 			//浼氳瘽鏈绠＄悊
 			//浼氳瘽绠＄悊鍣ㄤ腑涓嶅瓨鍦ㄦ浼氳瘽锛岃鏄庡垰寤虹珛缃戠粶杩炴帴锛�
@@ -56,8 +56,8 @@
 		PrefixedDataAvailableStatus dataStatus = this.pdaHandle.forOnLine(session, in) ;
 
 		if(dataStatus.protocolName != null && dataStatus.protocolVersion != null){
-			session.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName, dataStatus.protocolName) ;
-			session.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolVersion, dataStatus.protocolVersion) ;
+			session.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, dataStatus.protocolName) ;
+			session.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolVersion, dataStatus.protocolVersion) ;
 		}
 
 		if(dataStatus.isCompleted() || dataStatus.isAdjoined()){
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrIdIsRtuAddr.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrIdIsRtuAddr.java
deleted file mode 100644
index 93c0ecd..0000000
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrIdIsRtuAddr.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dy.common.mw.channel.tcp;
-
-/**
- * TCP Session涓斁鍏ョ殑灞炴�х殑ID灏辨槸姘磋〃鍙�
- * 褰撳簲鐢╮tuMw鏃剁敤鍒帮紝搴旂敤aepMw鏃剁敤涓嶅埌 
- *
- */
-public class TcpIoSessionAttrIdIsRtuAddr {
-
-	public static final String sessionArrRtuAddr = "key_rtuAddr" ; //杩欎釜key瀛樺偍鐨勬槸Rtu鍦板潃
-	public static final String sessionArrProtocolName = "key_pName" ; //杩欎釜key瀛樺偍鐨勬槸Rtu鍗忚鍚嶇О
-	public static final String sessionArrProtocolVersion = "key_pVerson" ; //杩欎釜key瀛樺偍鐨勬槸Rtu鍗忚鐗堟湰鍙�
-}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrKeys.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrKeys.java
new file mode 100644
index 0000000..39f5e34
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpIoSessionAttrKeys.java
@@ -0,0 +1,13 @@
+package com.dy.common.mw.channel.tcp;
+
+/**
+ * TCP Session涓斁鍏ョ殑灞炴�х殑ID灏辨槸姘磋〃鍙�
+ * 褰撳簲鐢╮tuMw鏃剁敤鍒帮紝搴旂敤aepMw鏃剁敤涓嶅埌 
+ *
+ */
+public class TcpIoSessionAttrKeys {
+
+	public static final String sessionAttrRtuAddr = "key_rtuAddr" ; //杩欎釜key瀛樺偍鐨勬槸Rtu鍦板潃
+	public static final String sessionAttrProtocolName = "key_pName" ; //杩欎釜key瀛樺偍鐨勬槸Rtu鍗忚鍚嶇О
+	public static final String sessionAttrProtocolVersion = "key_pVerson" ; //杩欎釜key瀛樺偍鐨勬槸Rtu鍗忚鐗堟湰鍙�
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpUnit.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpUnit.java
index 7528501..b6ddc65 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpUnit.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/TcpUnit.java
@@ -40,9 +40,9 @@
 	 * @throws Exception
 	 */
 	public void setIoSessionArrs(IoSession session, String rtuAddr, String protocolName, Short protocolVersion) throws Exception {
-		session.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrRtuAddr, rtuAddr) ;
-		session.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName, protocolName) ;
-		session.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolVersion, protocolVersion) ;
+		session.setAttribute(TcpIoSessionAttrKeys.sessionAttrRtuAddr, rtuAddr) ;
+		session.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, protocolName) ;
+		session.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolVersion, protocolVersion) ;
 	}
 
 	@Override
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailableHandleImp.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailableHandleImp.java
index 3b99830..24a0c14 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailableHandleImp.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailableHandleImp.java
@@ -3,7 +3,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 
-import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
+import com.dy.common.mw.channel.tcp.TcpIoSessionAttrKeys;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.mina.core.buffer.IoBuffer;
@@ -34,8 +34,8 @@
 				PrefixedDataAvailable pda = null ;
 
 				//浠庝細璇濈紦瀛樺緱鍒颁笂娆′笂琛屾暟鎹‘瀹氱殑鍗忚
-				String protocolName = (String) ioSession.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName) ;
-    			Short protocolVersion = (Short) ioSession.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolVersion) ;
+				String protocolName = (String) ioSession.getAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName) ;
+    			Short protocolVersion = (Short) ioSession.getAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolVersion) ;
     			//鐢变細璇濅腑鐨勫崗璁緱鍒板鐞嗙被
 				//鍒╃敤缂撳瓨鐨勫崗璁紝杩涜�屽涓嶇鍚堝崗璁殑涓婅鏁版嵁涔熻兘鐢ㄨ鍗忚澶勭悊浜嗭紝渚嬪RTU閲囩敤涓嶅悓鏁版嵁鍗忚鐨勫祵鍏ュ紡杞欢鍗囩骇鍗忚
 				//鍗砇TU绗竴鍖呮暟鎹‘瀹氫笅鏉ュ崗璁紝鍚庨潰鏁版嵁閮界敤杩欎釜鍗忚澶勭悊锛岄偅涔堟暟鎹彲浠ュ彉鍖栦簡锛屽彲浠ヤ笉绗﹀悎绗竴鍖呮暟鎹伒瀹堢殑鍗忚浜�
@@ -114,8 +114,8 @@
 				PrefixedDataAvailable pda = null ;
 
 				//浠庝細璇濈紦瀛樺緱鍒颁笂娆′笂琛屾暟鎹‘瀹氱殑鍗忚
-				String protocolName = (String) ioSession.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName) ;
-				Short protocolVersion = (Short) ioSession.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolVersion) ;
+				String protocolName = (String) ioSession.getAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName) ;
+				Short protocolVersion = (Short) ioSession.getAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolVersion) ;
 				//鐢变細璇濅腑鐨勫崗璁緱鍒板鐞嗙被
 				Object[] objs =  this.getClassObjAndAnnotationVo(protocolName, protocolVersion) ;
 				if(objs != null && objs[0] != null && objs[1] != null){
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java
index e4619c3..716538e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java
@@ -1,11 +1,9 @@
 package com.dy.common.mw.protocol.p206V1;
 
-import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
 import com.dy.common.util.ByteUtil;
 import com.dy.common.util.ByteUtilUnsigned;
 import com.dy.common.util.CRC16;
 import com.dy.common.util.CRC8_for_2_0;
-import org.apache.mina.core.session.IoSession;
 
 
 public class CommonV1 {
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java
index e13430e..db3c3bd 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java
@@ -1,6 +1,6 @@
 package com.dy.common.mw.protocol.p206V2;
 
-import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
+import com.dy.common.mw.channel.tcp.TcpIoSessionAttrKeys;
 import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
 import com.dy.common.util.ByteUtil;
 import com.dy.common.util.ByteUtilUnsigned;
@@ -16,8 +16,8 @@
 	 * @param ioSession 浼氳瘽
 	 */
 	public void setThisProtocolArr2IoSession(IoSession ioSession){
-		ioSession.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName, ProtocolConstantV206V1.protocolName) ;
-		ioSession.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName, ProtocolConstantV206V1.protocolVer) ;
+		ioSession.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, ProtocolConstantV206V1.protocolName) ;
+		ioSession.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, ProtocolConstantV206V1.protocolVer) ;
 	}
 	/**
 	 * 妫�鏌ュご
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
index e1fd7bd..5719fa4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
@@ -1,6 +1,6 @@
 package com.dy.common.mw.protocol.p206V202404;
 
-import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
+import com.dy.common.mw.channel.tcp.TcpIoSessionAttrKeys;
 
 import com.dy.common.util.ByteUtil;
 import com.dy.common.util.ByteUtilUnsigned;
@@ -16,8 +16,8 @@
      * @param ioSession 浼氳瘽
      */
     public void setThisProtocolArr2IoSession(IoSession ioSession){
-        ioSession.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName, ProtocolConstantV206V202404.protocolName) ;
-        ioSession.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName, ProtocolConstantV206V202404.protocolVer) ;
+        ioSession.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, ProtocolConstantV206V202404.protocolName) ;
+        ioSession.setAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName, ProtocolConstantV206V202404.protocolVer) ;
     }
     /**
      * 妫�鏌ュご
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpIoSessionCallback.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpIoSessionCallback.java
index 7bccddf..46be29d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpIoSessionCallback.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpIoSessionCallback.java
@@ -4,7 +4,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.mina.core.session.IoSession;
 
-import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
+import com.dy.common.mw.channel.tcp.TcpIoSessionAttrKeys;
 import com.dy.common.mw.channel.tcp.TcpIoSessionEventCallback;
 import com.dy.common.mw.core.CoreUnit;
 import com.dy.rtuMw.server.tasks.RtuUpTask;
@@ -19,7 +19,7 @@
 	public void sessionOpened(IoSession session) throws Exception {
     	log.info("缃戠粶杩炴帴寤虹珛锛岀粓绔綉鍧�鏄細" + session.getRemoteAddress().toString()) ;
 		if(session != null) {
-			String rtuAddr = (String) session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrRtuAddr);
+			String rtuAddr = (String) session.getAttribute(TcpIoSessionAttrKeys.sessionAttrRtuAddr);
 			if(rtuAddr != null && !rtuAddr.trim().equals("")){
 				RtuLogDealer.log(rtuAddr, "缃戠粶鎺ュ叆");
 			}
@@ -32,7 +32,7 @@
 	@Override
 	public void sessionClosed(IoSession session) throws Exception {
 		if(session != null){
-	     	String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrRtuAddr) ;
+	     	String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrKeys.sessionAttrRtuAddr) ;
 
 	     	if(rtuAddr != null && !rtuAddr.trim().equals("")){
 	     		//璁板綍鐘舵��
@@ -49,7 +49,7 @@
      */
     public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
     	if(session != null && cause != null){
-    		String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrRtuAddr) ;
+    		String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrKeys.sessionAttrRtuAddr) ;
     		log.error("缃戠粶浼氳瘽鍙戠敓寮傚父锛�"
     				+ (rtuAddr==null?"":("缁堢鍦板潃鏄細" + rtuAddr))
     				+ (session==null?"":(session.getRemoteAddress() != null?("锛岀粓绔綉鍧�鏄細" + session.getRemoteAddress().toString()):""))
@@ -61,7 +61,7 @@
      * TCP閫氶亾鍙戦�佸畬鏁版嵁鍚庯紝鍥炶皟鐨勬柟娉曪紝杩涜鍚庣画鏁版嵁澶勭悊
      */
     public void messageSended(IoSession session, Object message) throws Exception  {
-      	String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrRtuAddr) ;
+      	String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrKeys.sessionAttrRtuAddr) ;
     	log.info("缃戠粶鍙戦�佷簡鏁版嵁锛�"
     			+ (rtuAddr==null?"":("缁堢鍦板潃鏄細" + rtuAddr))
     			+ (session==null?"":(session.getRemoteAddress() != null?("锛岀粓绔綉鍧�鏄細" + session.getRemoteAddress().toString()):"")) );
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCache.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCache.java
index ab653ca..b00eb44 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCache.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCache.java
@@ -3,7 +3,7 @@
 import java.util.*;
 import java.util.Map.Entry;
 
-import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
+import com.dy.common.mw.channel.tcp.TcpIoSessionAttrKeys;
 import org.apache.mina.core.session.IoSession;
 
 import com.dy.rtuMw.server.ServerProperties;
@@ -118,8 +118,8 @@
 		TcpSession tcpSe = map.get(rtuAddr) ;
 		if(tcpSe != null){
 			return new Object[]{
-					tcpSe.ioSession.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName),
-					tcpSe.ioSession.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolVersion)};
+					tcpSe.ioSession.getAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName),
+					tcpSe.ioSession.getAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolVersion)};
 		}else{
 			return null ;
 		}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
index 06c34ed..e63202d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
@@ -11,7 +11,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.mina.core.session.IoSession;
 
-import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
+import com.dy.common.mw.channel.tcp.TcpIoSessionAttrKeys;
 import com.dy.common.mw.channel.tcp.TcpUnit;
 import com.dy.common.mw.core.CoreTask;
 import com.dy.rtuMw.server.ServerProperties;
@@ -55,9 +55,9 @@
 			e.printStackTrace();
 			log.error("灏嗘暟鎹浆鎹负鍗佸叚杩涘埗鏃跺嚭閿欙紒" ) ;
 		}
-		String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrRtuAddr) ;
-		String protocolName = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName) ;
-		Short protocolVersion = (Short)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolVersion) ;
+		String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrKeys.sessionAttrRtuAddr) ;
+		String protocolName = (String)session.getAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolName) ;
+		Short protocolVersion = (Short)session.getAttribute(TcpIoSessionAttrKeys.sessionAttrProtocolVersion) ;
 		boolean isOnLine = false ;
 		if(rtuAddr == null){
 			//璇存槑鍒氬缓绔嬬綉缁滆繛鎺ワ紝姝ゆ暟鎹簲璇ユ槸涓婄嚎鏁版嵁
@@ -191,7 +191,7 @@
 					if(rtuAddrInData != null && !rtuAddrInData.equals(rtuAddrAtHead)){
 						//鏁版嵁澶翠腑鐨凴TU鍦板潃涓庢暟鎹腑鐨凴TU鍦板潃涓嶄竴鑷达紝鏇存崲鎴愭暟鎹腑鐨凴TU鍦板潃
 						TcpSessionCache.changeRtuAddr(rtuAddrAtHead, rtuAddrInData, session);
-						session.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrRtuAddr, rtuAddrInData) ;
+						session.setAttribute(TcpIoSessionAttrKeys.sessionAttrRtuAddr, rtuAddrInData) ;
 					}
 
 					String rtuAddr ;

--
Gitblit v1.8.0