From 842237345ac469b02e9add8f9fd8bae5d4f7cdac Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 25 二月 2025 14:33:15 +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/RtuStatusDealer.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/RtuStatusDealer.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/RtuStatusDealer.java index 2ec4fb6..e7a25f0 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/RtuStatusDealer.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/RtuStatusDealer.java @@ -1,5 +1,6 @@ package com.dy.rtuMw.server.forTcp; +import com.dy.common.mw.protocol.rtuState.RtuStatus; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -22,18 +23,27 @@ * 寰楀埌閮ㄥ垎鐘舵�� * @return */ - public static Map<String, RtuStatus> partStatus(String[] rtuAddrArrGrp){ + public static Map<String, RtuStatus> someStatus(String[] rtuAddrArrGrp){ synchronized (map){ - Map<String, RtuStatus> map = new HashMap<>(); + Map<String, RtuStatus> rsMap = new HashMap<>(); for(String rtuAddr : rtuAddrArrGrp){ RtuStatus status = map.get(rtuAddr) ; if(status != null){ - map.put(rtuAddr, status) ; + rsMap.put(rtuAddr, status) ; } } - return map ; + return rsMap ; } } + /** + * 寰楀埌涓�涓猂TU鐨勭姸鎬� + * @return + */ + public static RtuStatus oneStatus(String rtuAddr){ + return map.get(rtuAddr) ; + } + + public static void onLine(String rtuAddr, String ip, Integer port, String protocolName, Short protocolVersion){ RtuStatus vo = map.get(rtuAddr) ; if(vo == null) { -- Gitblit v1.8.0