From e2c28bc98587c6edd6a38f06b972ff51d998028f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 27 十一月 2024 08:52:05 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
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 fe6e49c..387bb42 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
@@ -55,9 +55,9 @@
e.printStackTrace();
log.error("灏嗘暟鎹浆鎹负鍗佸叚杩涘埗鏃跺嚭閿欙紒" ) ;
}
- String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrIdKey) ;
- String protocolName = null ;
- Short protocolVersion = null ;
+ String rtuAddr = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrRtuAddr) ;
+ String protocolName = (String)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName) ;
+ Short protocolVersion = (Short)session.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolVersion) ;
boolean isOnLine = false ;
if(rtuAddr == null){
//璇存槑鍒氬缓绔嬬綉缁滆繛鎺ワ紝姝ゆ暟鎹簲璇ユ槸涓婄嚎鏁版嵁
@@ -69,13 +69,13 @@
protocolName = (String)rtuAddrProtocolNameVersion[1] ;
protocolVersion = (Short)rtuAddrProtocolNameVersion[2] ;
- if(rtuAddr != null && protocolName != null){
+ if(rtuAddr != null && protocolName != null && protocolVersion != null){
//璁剧疆session鐨勫睘鎬D
- TcpUnit.getInstance().setIoSessionArrId(session, rtuAddr);
+ TcpUnit.getInstance().setIoSessionArrs(session, rtuAddr, protocolName, protocolVersion) ;
//缂撳瓨session
- TcpSessionCache.putNewTcpSession(rtuAddr, protocolName, protocolVersion, session);
+ TcpSessionCache.putNewTcpSession(rtuAddr, session);
- log.info("RTU(鍦板潃锛�" + rtuAddr + "锛屽崗璁細" + protocolName + "锛屽崗璁増鏈彿锛�" + protocolVersion + ")涓婄嚎浜嗐��") ;
+ log.info("RTU(鍦板潃锛�" + rtuAddr + "锛屽崗璁細" + protocolName + "锛岀増鏈彿锛�" + protocolVersion + ")涓婄嚎浜嗐��") ;
}
}
}
@@ -95,11 +95,13 @@
}
}
if(toDeal){
+ /*
if(protocolName == null){
Object[] objs = TcpSessionCache.getTcpProtocolNameVersion(rtuAddr) ;
protocolName = (String)objs[0] ;
protocolVersion = (Short)objs[1] ;
}
+ */
//璁剧疆鏀跺埌鏁版嵁鏃跺埢
TcpSessionCache.cacheUpDataTime(rtuAddr);
@@ -171,7 +173,7 @@
boolean isOnLine,
byte[] upBuf,
String upHex) throws Exception{
- Driver dri = ProtocolCache.getDriver(protocolName) ;
+ Driver dri = ProtocolCache.getDriver(protocolName, protocolVersion) ;
if(dri == null){
log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒板崗璁�" + protocolName + "椹卞姩绫诲疄渚嬶紒");
}else{
@@ -181,8 +183,8 @@
//鏇存柊缁堢鐘舵��
if(rtuAddrInData != null && !rtuAddrInData.equals(rtuAddrAtHead)){
//鏁版嵁澶翠腑鐨凴TU鍦板潃涓庢暟鎹腑鐨凴TU鍦板潃涓嶄竴鑷达紝鏇存崲鎴愭暟鎹腑鐨凴TU鍦板潃
- TcpSessionCache.changeRtuAddr(rtuAddrAtHead, rtuAddrInData, protocolName, protocolVersion, session);
- session.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrIdKey, rtuAddrInData) ;
+ TcpSessionCache.changeRtuAddr(rtuAddrAtHead, rtuAddrInData, session);
+ session.setAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrRtuAddr, rtuAddrInData) ;
}
String rtuAddr ;
--
Gitblit v1.8.0