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/p206V2/ParseParamsForUpV2.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForUpV2.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForUpV2.java
index a8c3f1d..bfed77a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForUpV2.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForUpV2.java
@@ -6,6 +6,7 @@
public class ParseParamsForUpV2 implements CodeParseParams{
public String protocolName ;//鍗忚鍚嶇О
+ public Short protocolVersion ;//鍗忚鐗堟湰鍙�
public String rtuAddr ;//鎺у埗鍣ㄥ潃
public String upCode ;//涓婅鎶ユ枃鏁版嵁涓殑鍔熻兘鐮�
public String upHex ;//琛屾姤鏂囨暟鎹崄鍏繘鍒跺舰寮�
@@ -16,21 +17,24 @@
public void clear(){
this.protocolName = null ;
- this.rtuAddr = null ;
+ this.protocolVersion = null ;
+ this.rtuAddr = null ;
this.upCode = null ;
this.upHex = null ;
this.upBuffer = null ;
this.data = null ;
}
- public void setValue(String protocolName,
- String rtuAddr,
- String upCode,
- String upHex,
- byte[] upBuffer,
- Data data){
+ public void setValue(String protocolName,
+ Short protocolVersion,
+ String rtuAddr,
+ String upCode,
+ String upHex,
+ byte[] upBuffer,
+ Data data){
this.protocolName = protocolName ;
- this.rtuAddr = rtuAddr ;
+ this.protocolVersion = protocolVersion ;
+ this.rtuAddr = rtuAddr ;
this.upCode = upCode ;
this.upHex = upHex ;
this.upBuffer = upBuffer ;
--
Gitblit v1.8.0