From a15a8cfd7b01ce4bba6fe9fd876f6704ca23a12d Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 07 一月 2025 16:40:32 +0800 Subject: [PATCH] 1、取水口用水日统计表中增加金额、次数字段; 2、优化或重写“累计流量超过指定值的取水口”、“累计流量低于指定值的取水口”、“指定时间段内用水量超过指定值的取水口”、“指定时间段内消费金额超过指定值的取水口”几个统计查询; 3、改“指定时间段内用水时长超过指定值的取水口”为“指定时间段内用水次数超过指定值的取水口” --- 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