From d8eb22351c6d0bfe0c9f233edfd593538e6838c9 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 24 四月 2025 13:58:49 +0800 Subject: [PATCH] 1、表阀一体机协议开阀类型变化; 2、表阀一体机协议开关阀报中增加水价数据; --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java index c33a3c3..1e26b29 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java @@ -45,16 +45,17 @@ //鍚勪釜鍗忚椹卞姩绫绘壂鎻忚嚜宸辩殑鍔熻兘鐮佹敞瑙� HashMap<String, AnnotationDriverVo> drivers = ProtocolCache.getDriverMap() ; - Collection<String> colDrivers = drivers.keySet() ; + Collection<String> keys = drivers.keySet() ; StringBuilder totalProtocols = new StringBuilder() ; - for(String protocolName : colDrivers){ + for(String protocolNameVersion : keys){ if(!totalProtocols.isEmpty()){ totalProtocols.append("锛�") ; } - totalProtocols.append(protocolName) ; - Driver dri = ProtocolCache.getDriver(protocolName) ; + totalProtocols.append(protocolNameVersion) ; + Driver dri = ProtocolCache.getDriver(protocolNameVersion) ; if(dri != null){ dri.scanAnnotationCode(); + dri.setNotify(adapter.getSingleRtuInfoNotify(protocolNameVersion)); } } if(adapter.getConfig().showStartInfo){ -- Gitblit v1.8.0