From 7bdf147a26675542054563a5727977c54cfda9ef Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 13 二月 2025 14:19:53 +0800
Subject: [PATCH] 实现功能:远程模块remote接收通信中间件消息,补全取水口名称(编号)后,通过websocket向前端推送。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCacheBk.java |   60 +++++++++++++++++++++++-------------------------------------
 1 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCacheBk.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCacheBk.java
index 775b948..be8798f 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCacheBk.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpSessionCacheBk.java
@@ -32,7 +32,6 @@
 		TcpSession tcpSe = sessionTable.get(rtuAddr) ;
 		if(tcpSe == null){
 			tcpSe = new TcpSession() ;
-			tcpSe.protocolName = protocolName ;
 			tcpSe.ioSession = ioSession ;
 			sessionTable.put(rtuAddr, tcpSe) ;
 		}else{
@@ -68,20 +67,7 @@
 		return sessionTable.get(rtuAddr) ;
 	}
 	
-	/**
-	 * 寰楀埌Tcp閫氫俊鍗忚鍚嶇О
-	 * @param rtuAddr
-	 * @return
-	 */
-	public static String getTcpProtocolName(String rtuAddr){
-		TcpSession tcpSe = sessionTable.get(rtuAddr) ;
-		if(tcpSe != null){
-			return tcpSe.protocolName ;
-		}else{
-			return null ;
-		}
-	}
-	
+
 	/**
 	 * 寰楀埌鎵�鏈夊湪绾挎儏鍐�
 	 * @return
@@ -100,28 +86,28 @@
 	 * 寰楀埌鎵�鏈塕TU杩炴帴鐘舵�佹儏鍐�
 	 * @return
 	 */
-	public static List<RtuSessionStatus> allConnectStatus(){
-		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 ;
-	}
+//	public static List<RtuSessionStatus> allConnectStatus(){
+//		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 ;
+//	}
 	
 	
 	/**

--
Gitblit v1.8.0