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-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java
index c4aeaf7..30b2555 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java
@@ -44,19 +44,25 @@
//鍗囩骇閰嶇疆
if(ServerProperties.argOneDie){
UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦
+ }else{
+ UpCd9601.upData() ;
}
- UpCd9601.upData() ;
}else if(cd.equals("1602")){
//鍗囩骇鏁版嵁
- UpCd9602.upData() ;
count9602 ++ ;
if(ServerProperties.argMultiDie){
if(count9602 > 10){
int random = CreateRandom.create_between(10, 100) ;
if(random > 50){
UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦
+ }else{
+ UpCd9602.upData() ;
}
+ }else{
+ UpCd9602.upData() ;
}
+ }else{
+ UpCd9602.upData() ;
}
}else if(cd.equals("1603")){
//鍗囩骇鏍￠獙
--
Gitblit v1.8.0