From 39be193dece5ad6314aa22a41a2c8675e8057be3 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 12 十一月 2024 15:19:36 +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 | 219 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 167 insertions(+), 52 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 8d37adf..ca59202 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
@@ -1,11 +1,6 @@
package com.dy.rtuMw.server.forTcp;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
import java.util.Map.Entry;
import org.apache.mina.core.session.IoSession;
@@ -24,22 +19,59 @@
*
* 2023-12-19瀹炴祴锛屽彂鐜癏ashtable骞朵笉绾跨▼瀹夊叏锛屾墍浠ュ簲鐢ㄤ簡HashMap鍜宻ynchronized
*/
- private static HashMap<String, TcpSession> sessionTable = new HashMap<String, TcpSession>() ;
-
+ private static HashMap<String, TcpSession> map = new HashMap<String, TcpSession>() ;
+
+
+ /**
+ * 寰楀埌淇℃伅
+ * @return
+ */
+ public static Integer[] info(){
+ Integer rtuTotalConnect = 0 ;//宸茬粡杩炴帴杩囦腑闂翠欢鐨凴TU鎬绘暟锛堝寘鎷湪绾夸笌绂荤嚎鐨勶級
+ Integer rtuTotalOnLine = 0 ;//鍦ㄧ嚎RTU鎬绘暟
+ Integer rtuTotalOffLine = 0 ;//绂荤嚎RTU鎬绘暟
+ synchronized (map){
+ rtuTotalConnect = map.size() ;
+ Collection<TcpSession> col = map.values() ;
+ for(TcpSession se : col){
+ if(se.ioSession.isConnected()){
+ rtuTotalOnLine ++ ;
+ }else{
+ rtuTotalOffLine ++ ;
+ }
+ }
+ }
+ return new Integer[] {rtuTotalConnect, rtuTotalOnLine, rtuTotalOffLine} ;
+ }
+
+ /**
+ * 鍏抽棴鎵�鏈夌綉缁滆繛鎺�
+ */
+ public static void closeAllSessions(){
+ synchronized (map){
+ Collection<TcpSession> col = map.values() ;
+ for(TcpSession se : col){
+ se.ioSession.closeNow() ;
+ }
+ map.clear();
+ }
+ }
+
/**
* 鍔犲叆鏂扮殑IoSession
* @param rtuAddr
* @param protocolName
* @param ioSession
*/
- public static void putNewTcpSession(String rtuAddr, String protocolName, IoSession ioSession){
- synchronized (sessionTable){
- TcpSession tcpSe = sessionTable.get(rtuAddr) ;
+ public static void putNewTcpSession(String rtuAddr, String protocolName, Short protocolVersion, IoSession ioSession){
+ synchronized (map){
+ TcpSession tcpSe = map.get(rtuAddr) ;
if(tcpSe == null){
tcpSe = new TcpSession() ;
tcpSe.protocolName = protocolName ;
+ tcpSe.protocolVersion = protocolVersion ;
tcpSe.ioSession = ioSession ;
- sessionTable.put(rtuAddr, tcpSe) ;
+ map.put(rtuAddr, tcpSe) ;
}else{
tcpSe.ioSession = ioSession ;
}
@@ -51,17 +83,18 @@
* @param oldRtuAddr
* @param newRtuAddr
* @param protocolName
+ * @param protocolVersion
* @param ioSession
*/
- public static void changeRtuAddr(String oldRtuAddr, String newRtuAddr, String protocolName, IoSession ioSession){
+ public static void changeRtuAddr(String oldRtuAddr, String newRtuAddr, String protocolName, Short protocolVersion, IoSession ioSession){
if(oldRtuAddr != null && newRtuAddr != null && !oldRtuAddr.equals(newRtuAddr)){
- synchronized (sessionTable){
- TcpSession tcpSe = sessionTable.get(oldRtuAddr) ;
+ synchronized (map){
+ TcpSession tcpSe = map.get(oldRtuAddr) ;
if(tcpSe == null){
- putNewTcpSession(newRtuAddr, protocolName, ioSession) ;
+ putNewTcpSession(newRtuAddr, protocolName, protocolVersion, ioSession) ;
}else{
- sessionTable.remove(oldRtuAddr) ;
- sessionTable.put(newRtuAddr, tcpSe) ;
+ map.remove(oldRtuAddr) ;
+ map.put(newRtuAddr, tcpSe) ;
}
}
}
@@ -73,14 +106,14 @@
* @return
*/
public static TcpSession getTcpSession(String rtuAddr){
- return sessionTable.get(rtuAddr) ;
+ return map.get(rtuAddr) ;
}
-
+
/**
* 寰楀埌Tcp閫氫俊鍗忚鍚嶇О
* @param rtuAddr
* @return
- */
+
public static String getTcpProtocolName(String rtuAddr){
TcpSession tcpSe = sessionTable.get(rtuAddr) ;
if(tcpSe != null){
@@ -89,15 +122,50 @@
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};
+ }else{
+ return null ;
+ }
+ }
+
+ /**
+ * 寰楀埌鎵�鏈夊湪绾夸笌绂荤嚎鏁伴噺缁熻
+ * @return [0]=鍦ㄧ嚎鏁伴噺锛孾2]涓婄嚎杩囷紝浣嗗綋鍓嶇绾跨殑鏁伴噺
+ */
+ public static Integer[] allOnLineStateStatistics(){
+ synchronized (map){
+ Integer[] arr = new Integer[]{0, 0} ;
+ Iterator<Entry<String, TcpSession>> it = map.entrySet().iterator() ;
+ Entry<String, TcpSession> entry = null ;
+ while(it.hasNext()){
+ entry = it.next() ;
+ if(entry.getValue().ioSession.isConnected()){
+ arr[0]++ ;
+ }else{
+ arr[1]++ ;
+ }
+ }
+ return arr ;
+ }
+ }
/**
* 寰楀埌鎵�鏈夊湪绾挎儏鍐�
* @return
*/
public static HashMap<String, Boolean> allOnLine(){
- synchronized (sessionTable){
+ synchronized (map){
HashMap<String, Boolean> map = new HashMap<String, Boolean>();
- Iterator<Entry<String, TcpSession>> it = sessionTable.entrySet().iterator() ;
+ Iterator<Entry<String, TcpSession>> it = TcpSessionCache.map.entrySet().iterator() ;
Entry<String, TcpSession> entry = null ;
while(it.hasNext()){
entry = it.next() ;
@@ -106,35 +174,54 @@
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() ;
- }
+ public static HashMap<String, Boolean> partOnLine(String[] rtuAddrArrGrp){
+ synchronized (map){
+ HashMap<String, Boolean> map = new HashMap<String, Boolean>();
+ for(String rtuAddr : rtuAddrArrGrp){
+ TcpSession tcpSe = TcpSessionCache.map.get(rtuAddr) ;
+ if(tcpSe != null){
+ map.put(rtuAddr, tcpSe.ioSession.isConnected()) ;
}
- list.add(vo) ;
}
- return list ;
+ 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
@@ -155,7 +242,7 @@
* @return
*/
public static Boolean isConnect(String rtuAddr){
- TcpSession tcpSe = sessionTable.get(rtuAddr) ;
+ TcpSession tcpSe = map.get(rtuAddr) ;
if(tcpSe != null){
return tcpSe.ioSession.isConnected() ;
}
@@ -169,7 +256,7 @@
* @throws Exception
*/
public static void write(String rtuAddr, byte[] data) throws Exception{
- TcpSession tcpSe = sessionTable.get(rtuAddr) ;
+ TcpSession tcpSe = map.get(rtuAddr) ;
if(tcpSe != null){
if(tcpSe.ioSession.isConnected()){
tcpSe.ioSession.write(data) ;
@@ -186,30 +273,58 @@
* @param rtuAddr
*/
public static void cacheUpDataTime(String rtuAddr){
- TcpSession tcpSe = sessionTable.get(rtuAddr) ;
+ TcpSession tcpSe = map.get(rtuAddr) ;
if(tcpSe != null){
tcpSe.lastUpDataTime = System.currentTimeMillis() ;
+ tcpSe.lastUpDataTimeForOnlineCtrl = System.currentTimeMillis() ;
}
}
/**
* 鏇存柊涓婅鏁版嵁鏃跺埢
* 褰撲笂琛屾暟鎹椂鍒诲凡缁忚繃鍘讳竴瀹氭椂闀匡紝涓婅鏁版嵁鏃跺埢娓呯┖
+ * 褰撲竴瀹氭椂闂村唴娌℃湁涓婅鏁版嵁锛屽垯璁や负RTU绂荤嚎
*/
- public static void updateUpDataTime(Long now){
- synchronized (sessionTable){
- Iterator<TcpSession> it = sessionTable.values().iterator() ;
+ public static void updateRtuStatus(Long now){
+ synchronized (map){
+ Set<Map.Entry<String, TcpSession>> entrySet = map.entrySet() ;
+ Iterator<Map.Entry<String, TcpSession>> it = entrySet.iterator() ;
+ Map.Entry<String, TcpSession> entry ;
TcpSession tcpSe ;
while(it.hasNext()){
- tcpSe = it.next() ;
+ entry = it.next() ;
+ tcpSe = entry.getValue();
if(tcpSe.lastUpDataTime != null){
if(now - tcpSe.lastUpDataTime > ServerProperties.lastUpDataTimeLive){
tcpSe.lastUpDataTime = null ;
}
}
+ if(tcpSe.lastUpDataTimeForOnlineCtrl != null){
+ if(tcpSe.ioSession != null && tcpSe.ioSession.isConnected()){
+ if(now - tcpSe.lastUpDataTimeForOnlineCtrl > ServerProperties.disconnectedByNoUpDataMinutes){
+ tcpSe.ioSession.closeNow() ;
+ RtuLogDealer.log(entry.getKey(), "鍥犺緝闀挎椂闂存湭鏀朵笂琛屾暟鎹紝璁や负璁惧绂荤嚎");
+ }
+ }
+ }
}
}
}
+// 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