From 8d725e7bd1ad30b5ba437cbf420da622cfefc7c6 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 22 十一月 2024 15:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java
index b981223..7ddfe10 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java
@@ -1,5 +1,7 @@
package com.dy.rtuMw.server.local.localProtocol;
+import com.dy.rtuMw.server.forTcp.TcpSessionCache;
+
import java.util.HashMap;
public class RtuOnLineDeal {
@@ -7,14 +9,15 @@
/**
* 鏌ヨ鍦ㄧ嚎涓庝笉鍦ㄧ嚎鎯呭喌
*/
- public RtuOnLineVo deal(){
- //return (new RtuOnLineVo()).setOnLine(TcpSessionCache.allOnLine());
+ public HashMap<String, Boolean> dealAll(){
+ return TcpSessionCache.allOnLine();
+ }
- // 杩斿洖鍊兼祴璇曚唬鐮�
- HashMap<String , Boolean> onLineMap = new HashMap<>() ;
- onLineMap.put("37142501020100215", true);
- onLineMap.put("dy20240325", false);
- onLineMap.put("4000004", true);
- return (new RtuOnLineVo()).setOnLine(onLineMap);
+
+ /**
+ * 鏌ヨ鍦ㄧ嚎涓庝笉鍦ㄧ嚎鎯呭喌
+ */
+ public HashMap<String, Boolean> dealPart(String[] rtuAddrGrp){
+ return TcpSessionCache.partOnLine(rtuAddrGrp) ;
}
}
--
Gitblit v1.8.0