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-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwConfigVo.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwConfigVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwConfigVo.java
index d5de351..20a90e6 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwConfigVo.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/MwConfigVo.java
@@ -11,9 +11,15 @@
public String tcpServerIp = "" ;
//閫氫俊涓棿浠剁鍙�
public Integer tcpServerPort = 0 ;
+ //鍙戦�佹暟鎹暟鎹棿闅�
+ public Integer sendInterval = 2 ;//绉�
+ //姣忎竴杞鍙戦�佹暟鎹紝鍏朵腑鍖呮嫭蹇冭烦鍙戦�佹鏁�
+ public Integer heartbeatTimes = 3 ;
//鍙戦�佹暟鎹鏁�
public Integer sendTimes = 0 ;
-
+ //鍙戦�佸畬鏁版嵁鍚庯紝鏄惁鍏抽棴TCP杩炴帴锛�1鏄紝0鍚�
+ public Integer sendOverThenCloseConnect = 0 ;
+
/**
* 瀵硅薄杞垚json
* @return 杩斿洖 json
@@ -74,6 +80,22 @@
this.tcpServerPort = tcpServerPort;
}
+ public Integer getSendInterval() {
+ return sendInterval;
+ }
+
+ public void setSendInterval(Integer sendInterval) {
+ this.sendInterval = sendInterval;
+ }
+
+ public Integer getHeartbeatTimes() {
+ return heartbeatTimes;
+ }
+
+ public void setHeartbeatTimes(Integer heartbeatTimes) {
+ this.heartbeatTimes = heartbeatTimes;
+ }
+
public Integer getSendTimes() {
return sendTimes;
}
@@ -81,4 +103,12 @@
public void setSendTimes(Integer sendTimes) {
this.sendTimes = sendTimes;
}
+
+ public Integer getSendOverThenCloseConnect() {
+ return sendOverThenCloseConnect;
+ }
+
+ public void setSendOverThenCloseConnect(Integer sendOverThenCloseConnect) {
+ this.sendOverThenCloseConnect = sendOverThenCloseConnect;
+ }
}
--
Gitblit v1.8.0