From d5dab07dc674de7edbbc1bd6ade0486f54fbdb26 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 19:19:35 +0800 Subject: [PATCH] 1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- 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..3876932 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 > 90){ + UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦 + }else{ + UpCd9602.upData() ; + } }else{ UpCd9602.upData() ; } }else{ UpCd9602.upData() ; } - }else{ - UpCd9602.upData() ; } }else if(cd.equals("1603")){ //鍗囩骇鏍¢獙 -- Gitblit v1.8.0