From 183ad4afa2f8038271907270e5406c606fa8b075 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 07 八月 2024 10:12:00 +0800
Subject: [PATCH] 指定时间段内用水量超过指定值的取水口，修改上一次提交查询为查累积流量
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
index 8a2bfa1..707fc58 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
@@ -35,6 +35,8 @@
rt = this.stopTcpSv() ;
}else if(com.equals(CodeLocal.recoverTcpSv)){
rt = this.recoverTcpSv() ;
+ }else if(com.equals(CodeLocal.mwState)){
+ rt = this.mwState() ;
}else if(com.equals("10")){
rt = this.cd10() ;
}else if(com.equals("21")){
@@ -106,6 +108,10 @@
private BaseResponse recoverTcpSv(){
return this.sendCom2Mw(this.commandLocal(CodeLocal.recoverTcpSv, null, null)) ;
+ }
+
+ private BaseResponse mwState(){
+ return this.sendCom2Mw(this.commandLocal(CodeLocal.mwState, null, null)) ;
}
private BaseResponse cd10(){
@@ -236,7 +242,7 @@
comVo.moneyRemain = 234.56 ;
comVo.waterPrice = 1.2 ;
comVo.minutes = 3 ;
- String nextDtStr = DateTime.nextXMinute_yyyy_MM_dd_HH_mm_ss(DateTime.yyyy_MM_dd_HH_mm_ss(), 5) ;//灏嗘潵5鍒嗛挓
+ String nextDtStr = DateTime.nextXMinute_yyyy_MM_dd_HH_mm_ss(DateTime.yyyy_MM_dd_HH_mm_ss(), comVo.minutes) ;//灏嗘潵X鍒嗛挓
int[] nextDt = DateTime.yyyy_MM_dd_HH_MM_SS_2_ymdhmsGroup(nextDtStr) ;
comVo.year = nextDt[0] ;
comVo.month = nextDt[1] ;
--
Gitblit v1.8.0