From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 7a3c529..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,17 +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(protocolName));
+ dri.setNotify(adapter.getSingleRtuInfoNotify(protocolNameVersion));
}
}
if(adapter.getConfig().showStartInfo){
--
Gitblit v1.8.0