From 300cda64bc2f5ad7fb0a3c057c330ed905d12032 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 28 十一月 2024 15:15:08 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 30b2555..cf03982 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
@@ -42,27 +42,28 @@
String cd = cdPre + cdSuf;
if(cd.equals("1601")){
//鍗囩骇閰嶇疆
- if(ServerProperties.argOneDie){
- UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦
- }else{
- UpCd9601.upData() ;
- }
+ UpCd9601.upData() ;
+
}else if(cd.equals("1602")){
//鍗囩骇鏁版嵁
count9602 ++ ;
- if(ServerProperties.argMultiDie){
- if(count9602 > 10){
- int random = CreateRandom.create_between(10, 100) ;
- if(random > 50){
- UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦
+ if(ServerProperties.argOneDie){
+ UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦
+ }else{
+ if(ServerProperties.argMultiDie){
+ if(count9602 > 10){
+ int random = CreateRandom.create_between(10, 100) ;
+ if(random > 98){
+ UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦
+ }else{
+ UpCd9602.upData() ;
+ }
}else{
UpCd9602.upData() ;
}
}else{
UpCd9602.upData() ;
}
- }else{
- UpCd9602.upData() ;
}
}else if(cd.equals("1603")){
//鍗囩骇鏍￠獙
--
Gitblit v1.8.0