From 603c2fdeb4706a900adfdcb11e66e7a579e3d9a4 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 07 八月 2024 16:53:33 +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 | 78 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 30 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 d3ca03d..f84e95a 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
@@ -31,7 +31,13 @@
rt = this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
}else{
try{
- if(com.equals("10")){
+ if(com.equals(CodeLocal.stopTcpSv)){
+ 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")){
rt = this.cd21() ;
@@ -96,89 +102,101 @@
return this.sendTest() ;
}
+ private BaseResponse stopTcpSv(){
+ return this.sendCom2Mw(this.commandLocal(CodeLocal.stopTcpSv, null, null)) ;
+ }
+
+ 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(){
Com10Vo comVo = new Com10Vo() ;
comVo.rtuAddr = "532328059995" ;//鍓�6浣嶆槸琛屾斂鍖哄垝鐮侊紝鍚�6浣嶆槸搴忓垪鍙锋渶澶ф槸065535
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_10, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_10, comVo, null)) ;
}
private BaseResponse cd21(){
Com21Vo comVo = new Com21Vo() ;
comVo.ip = "8.140.180.59" ;//IP锛堜緥濡� 125.235.35.89锛�
comVo.port = 6001 ;///绔彛鍙凤紙0~65536锛�
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_21, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_21, comVo, null)) ;
}
private BaseResponse cd37(){
Com37Vo comVo = new Com37Vo() ;
comVo.seconds = 20 ;//鍗曚綅绉�
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_37, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_37, comVo, null)) ;
}
private BaseResponse cd67(){
Com37Vo comVo = new Com37Vo() ;
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_67, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_67, comVo, null)) ;
}
private BaseResponse cd38(){
Com38Vo comVo = new Com38Vo() ;
comVo.remainMoneyAlarm = 10.0 ;//鐢ㄦ埛浣欓鎶ヨ鍊�(澶т簬1.0)
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_38, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_38, comVo, null)) ;
}
private BaseResponse cd68(){
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_68, null, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_68, null, null)) ;
}
private BaseResponse cd39(){
Com39Vo comVo = new Com39Vo() ;
comVo.batteryVoltAlarm = 7.0 ;//鐢垫睜鐢靛帇鎶ヨ鍊�(澶т簬0.1)
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_39, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_39, comVo, null)) ;
}
private BaseResponse cd69(){
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_69, null, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_69, null, null)) ;
}
private BaseResponse cd3A(){
Com3AVo comVo = new Com3AVo() ;
comVo.current = 1.0 ;//闃�闂ㄥ牭杞數娴�(澶т簬0)
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_3A, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_3A, comVo, null)) ;
}
private BaseResponse cd6A(){
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_6A, null, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_6A, null, null)) ;
}
private BaseResponse cd3B(){
Com3BVo comVo = new Com3BVo() ;
comVo.second = 120 ;//闃�闂ㄨ秴鏃舵椂闂�(绉�)(澶т簬1)
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_3B, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_3B, comVo, null)) ;
}
private BaseResponse cd6B(){
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_6B, null, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_6B, null, null)) ;
}
private BaseResponse cd3C(){
Com3CVo comVo = new Com3CVo() ;
comVo.minute = 5 ;
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_3C, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_3C, comVo, null)) ;
}
private BaseResponse cd65(){
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_65, null, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_65, null, null)) ;
}
private BaseResponse<String> cd91() {
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_91, null, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_91, null, null)) ;
}
private BaseResponse cd92(){
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_92, null, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_92, null, null)) ;
}
private BaseResponse cd93(){
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_93, null, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_93, null, null)) ;
}
//APP杩滅▼寮�闃�
@@ -187,13 +205,13 @@
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)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_97, comVo, null)) ;
}
//APP杩滅▼鍏抽榾
private BaseResponse cd98(){
Com98Vo comVo = new Com98Vo() ;
comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_98, comVo, null)) ;
}
//瀹氭椂鍏抽榾寮�闃�
@@ -203,17 +221,17 @@
comVo.moneyRemain = 234.56 ;
comVo.waterPrice = 1.2 ;
comVo.minutes = 3 ;
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_99, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(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.moneyRemain = 1.23 ;
comVo.waterPrice = 1.2 ;
comVo.waterAmount = 10 ;
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_A0, comVo, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_A0, comVo, null)) ;
}
@@ -221,17 +239,17 @@
private BaseResponse cdA1() throws Exception {
ComA1Vo comVo = new ComA1Vo() ;
comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
- comVo.moneyRemain = 234.56 ;
+ comVo.moneyRemain = 1.23 ;
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鍒嗛挓
+ comVo.minutes = 30 ;
+ String nextDtStr = DateTime.nextXMinute_yyyy_MM_dd_HH_mm_ss(DateTime.yyyy_MM_dd_HH_mm_ss(), 3) ;//灏嗘潵X鍒嗛挓
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)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_A1, comVo, null)) ;
}
//瀹氶噺鍏抽榾璁″垝寮�闃�
@@ -241,19 +259,19 @@
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鍒嗛挓
+ String nextDtStr = DateTime.nextXMinute_yyyy_MM_dd_HH_mm_ss(DateTime.yyyy_MM_dd_HH_mm_ss(), 3) ;//灏嗘潵X鍒嗛挓
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)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_A2, comVo, null)) ;
}
private BaseResponse cdB0(){
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_B0, null, null)) ;
+ return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_B0, null, null)) ;
}
//鍦ㄧ嚎鎯呭喌
--
Gitblit v1.8.0