From 617fbf342de25d3e07629b9107b2f035101ee8da Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 06 八月 2024 15:48:40 +0800
Subject: [PATCH] 2024-08-06 朱宝民 优化代码
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 3750b15..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,8 +35,8 @@
rt = this.stopTcpSv() ;
}else if(com.equals(CodeLocal.recoverTcpSv)){
rt = this.recoverTcpSv() ;
- }else if(com.equals(CodeLocal.mwInfo)){
- rt = this.mwInfo() ;
+ }else if(com.equals(CodeLocal.mwState)){
+ rt = this.mwState() ;
}else if(com.equals("10")){
rt = this.cd10() ;
}else if(com.equals("21")){
@@ -110,8 +110,8 @@
return this.sendCom2Mw(this.commandLocal(CodeLocal.recoverTcpSv, null, null)) ;
}
- private BaseResponse mwInfo(){
- return this.sendCom2Mw(this.commandLocal(CodeLocal.mwInfo, null, null)) ;
+ private BaseResponse mwState(){
+ return this.sendCom2Mw(this.commandLocal(CodeLocal.mwState, null, null)) ;
}
private BaseResponse cd10(){
@@ -242,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