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/ParseParamsForDownV2.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForDownV2.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForDownV2.java
index b4e5305..3888618 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForDownV2.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForDownV2.java
@@ -6,6 +6,7 @@
public String rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
public String protocolName ;
+ public Short protocolVersion ;
public String rtuAddr ;//鎺у埗鍣ㄥ湴鍧�
public String commandId ;
public String commandCode ;
@@ -16,7 +17,8 @@
public void clear(){
this.protocolName = null ;
- this.rtuAddr = null ;
+ this.protocolVersion = null ;
+ this.rtuAddr = null ;
this.commandId = null ;
this.commandCode = null ;
this.param = null ;
@@ -26,6 +28,7 @@
public void setValue(
String rtuResultSendWebUrl,
String protocolName,
+ Short protocolVersion,
String rtuAddr,
String commandId,
String commandCode,
@@ -33,6 +36,7 @@
Object attachment ){
this.rtuResultSendWebUrl = rtuResultSendWebUrl ;
this.protocolName = protocolName ;
+ this.protocolVersion = protocolVersion ;
this.rtuAddr = rtuAddr ;
this.commandId = commandId ;
this.commandCode = commandCode ;
--
Gitblit v1.8.0