From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 十二月 2024 16:59:34 +0800 Subject: [PATCH] (1)升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败; (2)升级状态向Remote模块通知时,当升级任务结束后,仍要向remote模块通知可配置的次数; --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/RtuStatusDealer.java | 17 +++++++++++++---- 1 files changed, 13 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..9f8c204 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 @@ -22,18 +22,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