From 9fb370afff71f4d5659d8904e8751479280d5b48 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 09:26:50 +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/forTcp/TcpSessionCache.java | 105 +++++++++-------------------------------------------
1 files changed, 18 insertions(+), 87 deletions(-)
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 ca59202..144593d 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,6 +3,7 @@
import java.util.*;
import java.util.Map.Entry;
+import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
import org.apache.mina.core.session.IoSession;
import com.dy.rtuMw.server.ServerProperties;
@@ -60,16 +61,16 @@
/**
* 鍔犲叆鏂扮殑IoSession
* @param rtuAddr
- * @param protocolName
* @param ioSession
*/
- public static void putNewTcpSession(String rtuAddr, String protocolName, Short protocolVersion, IoSession ioSession){
+ //public static void putNewTcpSession(String rtuAddr, String protocolName, Short protocolVersion, IoSession ioSession){
+ public static void putNewTcpSession(String rtuAddr, IoSession ioSession){
synchronized (map){
TcpSession tcpSe = map.get(rtuAddr) ;
if(tcpSe == null){
tcpSe = new TcpSession() ;
- tcpSe.protocolName = protocolName ;
- tcpSe.protocolVersion = protocolVersion ;
+ //tcpSe.protocolName = protocolName ;
+ //tcpSe.protocolVersion = protocolVersion ;
tcpSe.ioSession = ioSession ;
map.put(rtuAddr, tcpSe) ;
}else{
@@ -82,16 +83,15 @@
* 鏇存柊IoSession瀵瑰簲鐨剅tuAddr
* @param oldRtuAddr
* @param newRtuAddr
- * @param protocolName
- * @param protocolVersion
* @param ioSession
*/
- public static void changeRtuAddr(String oldRtuAddr, String newRtuAddr, String protocolName, Short protocolVersion, IoSession ioSession){
+ //public static void changeRtuAddr(String oldRtuAddr, String newRtuAddr, String protocolName, Short protocolVersion, IoSession ioSession){
+ public static void changeRtuAddr(String oldRtuAddr, String newRtuAddr, IoSession ioSession){
if(oldRtuAddr != null && newRtuAddr != null && !oldRtuAddr.equals(newRtuAddr)){
synchronized (map){
TcpSession tcpSe = map.get(oldRtuAddr) ;
if(tcpSe == null){
- putNewTcpSession(newRtuAddr, protocolName, protocolVersion, ioSession) ;
+ putNewTcpSession(newRtuAddr, ioSession) ;
}else{
map.remove(oldRtuAddr) ;
map.put(newRtuAddr, tcpSe) ;
@@ -113,33 +113,22 @@
* 寰楀埌Tcp閫氫俊鍗忚鍚嶇О
* @param rtuAddr
* @return
-
- public static String getTcpProtocolName(String rtuAddr){
- TcpSession tcpSe = sessionTable.get(rtuAddr) ;
- if(tcpSe != null){
- return tcpSe.protocolName ;
- }else{
- return null ;
- }
- }
- */
- /**
- * 寰楀埌Tcp閫氫俊鍗忚鍚嶇О
- * @param rtuAddr
- * @return
- */
+ * */
public static Object[] getTcpProtocolNameVersion(String rtuAddr){
TcpSession tcpSe = map.get(rtuAddr) ;
if(tcpSe != null){
- return new Object[]{tcpSe.protocolName, tcpSe.protocolVersion};
+ return new Object[]{
+ tcpSe.ioSession.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolName),
+ tcpSe.ioSession.getAttribute(TcpIoSessionAttrIdIsRtuAddr.sessionArrProtocolVersion)};
}else{
return null ;
}
}
+
/**
* 寰楀埌鎵�鏈夊湪绾夸笌绂荤嚎鏁伴噺缁熻
- * @return [0]=鍦ㄧ嚎鏁伴噺锛孾2]涓婄嚎杩囷紝浣嗗綋鍓嶇绾跨殑鏁伴噺
+ * @return [0]=鍦ㄧ嚎鏁伴噺锛孾1]涓婄嚎杩囷紝浣嗗綋鍓嶇绾跨殑鏁伴噺
*/
public static Integer[] allOnLineStateStatistics(){
synchronized (map){
@@ -192,50 +181,7 @@
return map ;
}
}
-//
-// /**
-// * 寰楀埌鎵�鏈塕TU杩炴帴鐘舵�佹儏鍐�
-// * @return
-// */
-// public static List<RtuSessionStatus> allConnectStatus(){
-// synchronized (sessionTable){
-// List<RtuSessionStatus> list = new ArrayList<RtuSessionStatus>();
-// Iterator<Entry<String, TcpSession>> it = sessionTable.entrySet().iterator() ;
-// Entry<String, TcpSession> entry = null ;
-// while(it.hasNext()){
-// entry = it.next() ;
-// RtuSessionStatus vo = new RtuSessionStatus() ;
-// vo.rtuAddr = entry.getKey() ;
-// IoSession se = entry.getValue().ioSession ;
-// vo.onTrueOffLine = se.isConnected() ;
-// InetSocketAddress sa = (InetSocketAddress)se.getRemoteAddress() ;
-// if(sa != null){
-// InetAddress inetAddr = sa.getAddress() ;
-// if(inetAddr != null){
-// vo.ip = inetAddr.getHostAddress() ;
-// vo.port = sa.getPort() ;
-// }
-// }
-// list.add(vo) ;
-// }
-// return list ;
-// }
-// }
-//
-
- /**
- * 寰楀埌IoSession
- * @param rtuAddr
- * @return
- */
-// public IoSession getIoSession(String rtuAddr){
-// TcpSession tcpSe = sessionMap.get(rtuAddr) ;
-// if(tcpSe != null){
-// return tcpSe.ioSession ;
-// }
-// return null ;
-// }
-
+
/**
* 缃戠粶鏄惁杩炴帴
* @param rtuAddr
@@ -269,12 +215,13 @@
}
/**
- * 璁剧疆涓婅鏁版嵁鏃跺埢
+ * 褰撴湁涓婅鏁版嵁鏃�
* @param rtuAddr
*/
- public static void cacheUpDataTime(String rtuAddr){
+ public static void whenUpData(String rtuAddr){
TcpSession tcpSe = map.get(rtuAddr) ;
if(tcpSe != null){
+ tcpSe.lastDownComTime = 0L ;//缃�0锛屼娇绛夊緟lastUpDataTimeLive锛堣config.xml閰嶇疆鏂囦欢锛夋椂闀垮悗锛屽嵆鍒讳笅鍙戠紦瀛樹腑鐨勫懡浠�
tcpSe.lastUpDataTime = System.currentTimeMillis() ;
tcpSe.lastUpDataTimeForOnlineCtrl = System.currentTimeMillis() ;
}
@@ -310,21 +257,5 @@
}
}
}
-
-// public static void updateRtuStatus(Long now){
-// synchronized (sessionTable){
-// Iterator<TcpSession> it = sessionTable.values().iterator() ;
-// TcpSession tcpSe ;
-// while(it.hasNext()){
-// tcpSe = it.next() ;
-// if(tcpSe.lastUpDataTime != null){
-// if(now - tcpSe.lastUpDataTime > ServerProperties.lastUpDataTimeLive){
-// tcpSe.lastUpDataTime = null ;
-// }
-// }
-// }
-// }
-// }
-
}
--
Gitblit v1.8.0