From 477190adac670e623b59a363fb5c3725227dc041 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 25 七月 2024 16:59:12 +0800
Subject: [PATCH] 完善代码，数据库表名称写错了。
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 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 746247a..8a475f0 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
@@ -29,7 +29,9 @@
if(com == null){
rt = this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
}else{
- if(com.equals("21")){
+ if(com.equals("10")){
+ rt = this.cd10() ;
+ }else if(com.equals("21")){
rt = this.cd21() ;
}else if(com.equals("37")){
rt = this.cd37() ;
@@ -65,6 +67,10 @@
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() ;
}
@@ -79,6 +85,12 @@
*/
private BaseResponse connect(){
return this.sendTest() ;
+ }
+
+ private BaseResponse cd10(){
+ Com10Vo comVo = new Com10Vo() ;
+ comVo.rtuAddr = "532328059995" ;//鍓�6浣嶆槸琛屾斂鍖哄垝鐮侊紝鍚�6浣嶆槸搴忓垪鍙锋渶澶ф槸065535
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_10, comVo, null)) ;
}
private BaseResponse cd21(){
@@ -130,7 +142,7 @@
private BaseResponse cd3B(){
Com3BVo comVo = new Com3BVo() ;
- comVo.second = 30 ;//闃�闂ㄨ秴鏃舵椂闂�(绉�)(澶т簬1)
+ comVo.second = 120 ;//闃�闂ㄨ秴鏃舵椂闂�(绉�)(澶т簬1)
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_3B, comVo, null)) ;
}
@@ -140,7 +152,7 @@
private BaseResponse cd3C(){
Com3CVo comVo = new Com3CVo() ;
- comVo.minute = 60 ;
+ comVo.minute = 5 ;
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_3C, comVo, null)) ;
}
@@ -163,7 +175,7 @@
//APP杩滅▼寮�闃�
private BaseResponse cd97(){
Com97Vo comVo = new Com97Vo() ;
- comVo.icCardNo = CommandP206V1_0_0Ctrl.icCardNo ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
comVo.moneyRemain = 234.56 ;
comVo.waterPrice = 1.2 ;
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_97, comVo, null)) ;
@@ -171,7 +183,27 @@
//APP杩滅▼鍏抽榾
private BaseResponse cd98(){
Com98Vo comVo = new Com98Vo() ;
- comVo.icCardNo = CommandP206V1_0_0Ctrl.icCardNo ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
+ }
+
+ //瀹氭椂鍏抽榾寮�闃�
+ private BaseResponse cd99(){
+ Com99Vo comVo = new Com99Vo() ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ comVo.moneyRemain = 234.56 ;
+ comVo.waterPrice = 1.2 ;
+ comVo.minutes = 5 ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_99, comVo, null)) ;
+ }
+
+ //瀹氶噺鍏抽榾寮�闃�
+ private BaseResponse cdA0(){
+ ComA0Vo comVo = new ComA0Vo() ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ comVo.moneyRemain = 234.56 ;
+ comVo.waterPrice = 1.2 ;
+ comVo.waterAmount = 10 ;
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
}
--
Gitblit v1.8.0