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/channel/tcp/PrefixedDataAvailableStatus.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java
index 2045a91..3fe03b0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java
@@ -9,6 +9,8 @@
private Integer status ;
private Integer dataLen ;
+ public String protocolName;
+ public Short protocolVersion;
public PrefixedDataAvailableStatus(){
status = null ;
@@ -44,9 +46,11 @@
* @return 鐘舵��
*/
@SuppressWarnings("unused")
- public PrefixedDataAvailableStatus adjoined(Integer dataLen){
+ public PrefixedDataAvailableStatus adjoined(Integer dataLen, String protocolName, Short protocolVersion){
this.status = status_adjoin ;
this.dataLen = dataLen ;
+ this.protocolName = protocolName ;
+ this.protocolVersion = protocolVersion ;
return this ;
}
@@ -56,9 +60,11 @@
* @return 鐘舵��
*/
@SuppressWarnings("unused")
- public PrefixedDataAvailableStatus completed(Integer dataLen){
+ public PrefixedDataAvailableStatus completed(Integer dataLen, String protocolName, Short protocolVersion){
this.status = status_complete ;
this.dataLen = dataLen ;
+ this.protocolName = protocolName ;
+ this.protocolVersion = protocolVersion ;
return this ;
}
--
Gitblit v1.8.0