From 8ca2d2b49dccc417baad02c003eb7d9ae7dacc56 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 26 七月 2024 15:49:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java | 137 ++++++++++++++++++++++++++++++---------------
1 files changed, 91 insertions(+), 46 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 8a475f0..d3ca03d 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
@@ -5,6 +5,7 @@
import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.*;
+import com.dy.common.util.DateTime;
import com.dy.common.webUtil.BaseResponse;
import com.dy.pipIrrMwTestWeb.common.CodeLocal;
import lombok.extern.slf4j.Slf4j;
@@ -29,50 +30,58 @@
if(com == null){
rt = this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
}else{
- if(com.equals("10")){
- rt = this.cd10() ;
- }else if(com.equals("21")){
- rt = this.cd21() ;
- }else if(com.equals("37")){
- rt = this.cd37() ;
- }else if(com.equals("67")){
- rt = this.cd67() ;
- }else if(com.equals("38")){
- rt = this.cd38() ;
- }else if(com.equals("68")){
- rt = this.cd68() ;
- }else if(com.equals("39")){
- rt = this.cd39() ;
- }else if(com.equals("69")){
- rt = this.cd69() ;
- }else if(com.equals("3A")){
- rt = this.cd3A() ;
- }else if(com.equals("6A")){
- rt = this.cd6A() ;
- }else if(com.equals("3B")){
- rt = this.cd3B() ;
- }else if(com.equals("6B")){
- rt = this.cd6B() ;
- }else if(com.equals("3C")){
- rt = this.cd3C() ;
- }else if(com.equals("65")){
- rt = this.cd65() ;
- }else if(com.equals("91")){
- rt = this.cd91() ;
- }else if(com.equals("92")){
- rt = this.cd92() ;
- }else if(com.equals("93")){
- rt = this.cd93() ;
- }else if(com.equals("97")){
- rt = this.cd97() ;
- }else if(com.equals("98")){
- rt = this.cd98() ;
- }else if(com.equals("99")){
- rt = this.cd99() ;
- }else if(com.equals("A0")){
- rt = this.cdA0() ;
- }else if(com.equals("B0")){
- rt = this.cdB0() ;
+ try{
+ if(com.equals("10")){
+ rt = this.cd10() ;
+ }else if(com.equals("21")){
+ rt = this.cd21() ;
+ }else if(com.equals("37")){
+ rt = this.cd37() ;
+ }else if(com.equals("67")){
+ rt = this.cd67() ;
+ }else if(com.equals("38")){
+ rt = this.cd38() ;
+ }else if(com.equals("68")){
+ rt = this.cd68() ;
+ }else if(com.equals("39")){
+ rt = this.cd39() ;
+ }else if(com.equals("69")){
+ rt = this.cd69() ;
+ }else if(com.equals("3A")){
+ rt = this.cd3A() ;
+ }else if(com.equals("6A")){
+ rt = this.cd6A() ;
+ }else if(com.equals("3B")){
+ rt = this.cd3B() ;
+ }else if(com.equals("6B")){
+ rt = this.cd6B() ;
+ }else if(com.equals("3C")){
+ rt = this.cd3C() ;
+ }else if(com.equals("65")){
+ rt = this.cd65() ;
+ }else if(com.equals("91")){
+ rt = this.cd91() ;
+ }else if(com.equals("92")){
+ rt = this.cd92() ;
+ }else if(com.equals("93")){
+ rt = this.cd93() ;
+ }else if(com.equals("97")){
+ rt = this.cd97() ;
+ }else if(com.equals("98")){
+ rt = this.cd98() ;
+ }else if(com.equals("99")){
+ rt = this.cd99() ;
+ }else if(com.equals("A0")){
+ rt = this.cdA0() ;
+ }else if(com.equals("A1")){
+ rt = this.cdA1() ;
+ }else if(com.equals("A2")){
+ rt = this.cdA2() ;
+ }else if(com.equals("B0")){
+ rt = this.cdB0() ;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
}
}
return rt ;
@@ -193,7 +202,7 @@
comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
comVo.moneyRemain = 234.56 ;
comVo.waterPrice = 1.2 ;
- comVo.minutes = 5 ;
+ comVo.minutes = 3 ;
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_99, comVo, null)) ;
}
@@ -204,9 +213,45 @@
comVo.moneyRemain = 234.56 ;
comVo.waterPrice = 1.2 ;
comVo.waterAmount = 10 ;
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_A0, comVo, null)) ;
}
+
+ //瀹氭椂鍏抽榾璁″垝寮�闃�
+ private BaseResponse cdA1() throws Exception {
+ ComA1Vo comVo = new ComA1Vo() ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ 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鍒嗛挓
+ int[] nextDt = DateTime.yyyy_MM_dd_HH_MM_SS_2_ymdhmsGroup(nextDtStr) ;
+ comVo.year = nextDt[0] ;
+ comVo.month = nextDt[1] ;
+ comVo.day = nextDt[2] ;
+ comVo.hour = nextDt[3] ;
+ comVo.minute = nextDt[4] ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_A1, comVo, null)) ;
+ }
+
+ //瀹氶噺鍏抽榾璁″垝寮�闃�
+ private BaseResponse cdA2() throws Exception {
+ ComA2Vo comVo = new ComA2Vo() ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ comVo.moneyRemain = 234.56 ;
+ comVo.waterPrice = 1.2 ;
+ comVo.waterAmount = 10 ;
+ String nextDtStr = DateTime.nextXMinute_yyyy_MM_dd_HH_mm_ss(DateTime.yyyy_MM_dd_HH_mm_ss(), 5) ;//灏嗘潵5鍒嗛挓
+ int[] nextDt = DateTime.yyyy_MM_dd_HH_MM_SS_2_ymdhmsGroup(nextDtStr) ;
+ comVo.year = nextDt[0] ;
+ comVo.month = nextDt[1] ;
+ comVo.day = nextDt[2] ;
+ comVo.hour = nextDt[3] ;
+ comVo.minute = nextDt[4] ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_A2, comVo, null)) ;
+ }
+
+
private BaseResponse cdB0(){
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_B0, null, null)) ;
}
--
Gitblit v1.8.0