From 186aac796d81fd1799c9503558c1081c5102ab74 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 27 二月 2025 17:18:11 +0800
Subject: [PATCH] 根据RTU协议修改内容，将开关阀类型加入上报数据中；
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 87020e3..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
@@ -5,7 +5,7 @@
import com.dy.common.mw.UnitAdapterInterface;
import com.dy.common.mw.UnitInterface;
-import com.dy.common.mw.UnitStartedCallbackInterface;
+import com.dy.common.mw.UnitCallbackInterface;
public class ProtocolUnit implements UnitInterface {
@@ -39,23 +39,23 @@
/**
* 鍚姩妯″潡
*/
- public void start(UnitStartedCallbackInterface callback) throws Exception {
+ public void start(UnitCallbackInterface callback) throws Exception {
//寰楀埌鍞竴瀹炰緥锛� 骞跺湪鐢熸垚鍞竴瀹炰緥鏃讹紝鎵弿娉ㄨВ绫�
AnnotationScan.getIntance() ;
//鍚勪釜鍗忚椹卞姩绫绘壂鎻忚嚜宸辩殑鍔熻兘鐮佹敞瑙�
- HashMap<String, AnnotationDriverVo> drivers = ProtocolCach.getDriverMap() ;
- Collection<String> colDrivers = drivers.keySet() ;
- String totalProtocols = null ;
- for(String protocolName : colDrivers){
- if(totalProtocols == null){
- totalProtocols = protocolName ;
- }else{
- totalProtocols += "锛�" + protocolName ;
+ HashMap<String, AnnotationDriverVo> drivers = ProtocolCache.getDriverMap() ;
+ Collection<String> keys = drivers.keySet() ;
+ StringBuilder totalProtocols = new StringBuilder() ;
+ for(String protocolNameVersion : keys){
+ if(!totalProtocols.isEmpty()){
+ totalProtocols.append("锛�") ;
}
- Driver dri = ProtocolCach.getDriver(protocolName) ;
+ totalProtocols.append(protocolNameVersion) ;
+ Driver dri = ProtocolCache.getDriver(protocolNameVersion) ;
if(dri != null){
dri.scanAnnotationCode();
+ dri.setNotify(adapter.getSingleRtuInfoNotify(protocolNameVersion));
}
}
if(adapter.getConfig().showStartInfo){
@@ -71,12 +71,12 @@
*/
@SuppressWarnings("unused")
public boolean isOnlyOneProtocol(){
- HashMap<String, AnnotationDriverVo> drivers = ProtocolCach.getDriverMap() ;
+ HashMap<String, AnnotationDriverVo> drivers = ProtocolCache.getDriverMap() ;
return drivers.size() == 1 ;
}
@Override
- public void stop(UnitStartedCallbackInterface callback) {
+ public void stop(UnitCallbackInterface callback) {
}
/*
--
Gitblit v1.8.0