From c929083f415ef98765afec91d5a8c88be4450f5b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 30 五月 2024 09:16:11 +0800
Subject: [PATCH] 为甘肃嘉峪关项目基于靳总制定协议实现一款产品
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V202404Ctrl.java | 91 ++++++++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 46 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V202404Ctrl.java
similarity index 70%
rename from pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandCtrl.java
rename to pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V202404Ctrl.java
index a824671..f911f5b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V202404Ctrl.java
@@ -3,7 +3,6 @@
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.downVos.*;
import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -14,9 +13,9 @@
*/
@Slf4j
@RestController
-@RequestMapping(path="com")
+@RequestMapping(path="comP206V202404")
@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
-public class CommandCtrl extends ComSupport {
+public class CommandP206V202404Ctrl extends ComSupportP206V202404 {
@GetMapping(path = "test")
public BaseResponse<String> test() {
@@ -54,18 +53,18 @@
//璁剧疆缁堢鍦板潃(AFN=0x10H)
private BaseResponse cd10(){
ComCd10Vo comVo = new ComCd10Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
- comVo.rtuNewAddr = CommandCtrl.rtuAddr ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.rtuNewAddr = CommandP206V202404Ctrl.rtuAddr ;
return this.sendCom2Mw(this.command(CodeV202404.cd_10, comVo, null)) ;
}
//杩滅▼鐢ㄦ埛鍏呭�� (AFN=0x15H)
private BaseResponse cd15(){
ComCd15Vo comVo = new ComCd15Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
- comVo.icCardAddr = CommandCtrl.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
- comVo.icCardNo = CommandCtrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.icCardAddr = CommandP206V202404Ctrl.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
+ comVo.icCardNo = CommandP206V202404Ctrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
comVo.chargeMoney = 20.0 ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.chargeWater = 20.0 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.flowNo = "123456789012" ;//娴佹按鍙凤紙12浣嶆暟瀛楋級
@@ -75,8 +74,8 @@
//璁剧疆璁惧缁堢鍓╀綑姘撮噺鍜屽墿浣欓噾棰濇姤璀﹀�� (AFN=0x16H)
private BaseResponse cd16(){
ComCd16Vo comVo = new ComCd16Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.waterAlarm = 100 ;//鍓╀綑姘撮噺鎶ヨ鍊�,鍗曚綅:m3銆傛暣鏁帮紝鍙栧�艰寖鍥�0~9999
comVo.moneyAlarm = 3 ;//鍓╀綑閲戦鎶ヨ鍊�,鍗曚綅:鍏冦�傛暣鏁帮紝鍙栧�艰寖鍥�0~9999
@@ -85,8 +84,8 @@
//璁剧疆璁惧缁堢IP鍦板潃 (AFN=0x21H)
private BaseResponse cd21(){
ComCd21Vo comVo = new ComCd21Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
comVo.ip = "8.140.180.59" ;//IP锛堜緥濡� 125.235.35.89锛�
comVo.port = 6001 ;///绔彛鍙凤紙0~65536锛�
@@ -96,8 +95,8 @@
//璁剧疆鏈轰簳骞存渶澶у紑閲囬噺鍜屾按浣嶄笅闄� (AFN=0x22H)
private BaseResponse cd22(){
ComCd22Vo comVo = new ComCd22Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.maxAmountYear = 99998888 ;//鏈轰簳骞存渶澶х敤姘撮噺鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
comVo.limitLevel = 9978.60; //姘翠綅涓嬮檺 鍗曚綅锛歮 鍙栧�艰寖鍥�:0~9999.99
@@ -106,8 +105,8 @@
//璁剧疆璁惧缁堢鍩熷悕(AFN=0x23H)
private BaseResponse cd23(){
ComCd23Vo comVo = new ComCd23Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
comVo.domain = "dayuyanjiuyuan.top" ;//鍩熷悕锛堜緥濡� dayuyanjiuyuan.top锛夛紝鏈�澶ч暱搴�42瀛楃
comVo.port = 6001 ;///绔彛鍙凤紙0~65536锛�
@@ -117,8 +116,8 @@
//璁剧疆璁惧缁堢娉ㄥ唽鍙�(AFN=0x24H)
private BaseResponse cd24(){
ComCd24Vo comVo = new ComCd24Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.registerNo = "10203040506070809000" ;//
return this.sendCom2Mw(this.command(CodeV202404.cd_24, comVo, null)) ;
@@ -126,8 +125,8 @@
//璁剧疆璁惧缁堢骞寸敤姘撮噺(AFN=0x24H)
private BaseResponse cd26(){
ComCd26Vo comVo = new ComCd26Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.maxAmountYear = 200 ;//璁惧缁堢骞寸敤姘撮噺 鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
return this.sendCom2Mw(this.command(CodeV202404.cd_26, comVo, null)) ;
@@ -135,8 +134,8 @@
//璁剧疆璁惧缁堢鐢ㄦ按鏈夋晥(AFN=0x31H)
private BaseResponse cd31(){
ComCd31Vo comVo = new ComCd31Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.valid = false ;//鏈夋晥鎬�
return this.sendCom2Mw(this.command(CodeV202404.cd_31, comVo, null)) ;
@@ -144,8 +143,8 @@
//鏌ヨ閬ユ祴缁堢鍏呭�艰褰� (AFN=0x55H)
private BaseResponse cd55(int page){
ComCd55Vo comVo = new ComCd55Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.page = page ;//鍒嗛〉锛堝彇鍊艰寖鍥�1銆�2銆�3銆�4銆�5銆�6銆�7銆�8銆�9锛�
return this.sendCom2Mw(this.command(CodeV202404.cd_55, comVo, null)) ;
@@ -153,34 +152,34 @@
//鏌ヨ璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍(AFN=0x65H)
private BaseResponse cd65(int page){
ComCd65Vo comVo = new ComCd65Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.page = page ;
return this.sendCom2Mw(this.command(CodeV202404.cd_65, comVo, null)) ;
}
//鏌ヨ鎺у埗鍣↖P鍦板潃(AFN=0x86H)
private BaseResponse cd86(){
ComCd86Vo comVo = new ComCd86Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
return this.sendCom2Mw(this.command(CodeV202404.cd_86, comVo, null)) ;
}
//鏌ヨ鎺у埗鍣ㄥ煙鍚�(AFN=0x87H)
private BaseResponse cd87(){
ComCd87Vo comVo = new ComCd87Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
return this.sendCom2Mw(this.command(CodeV202404.cd_87, comVo, null)) ;
}
//骞冲彴/APP杩滅▼寮�鍚按娉�/闃�闂�(AFN=0x92H/AFN=0xA2H)
private BaseResponse cd92(){
ComCd92_A2Vo comVo = new ComCd92_A2Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
//comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
- comVo.icCardNo = CommandCtrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.icCardNo = CommandP206V202404Ctrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
comVo.waterRemain = 123.45 ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.moneyRemain = 234.56 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.waterPrice = 0.8 ;//姘撮噺鍗曚环 鍗曚綅:鍏�, 2涓皬鏁扮偣
@@ -192,10 +191,10 @@
//骞冲彴/APP杩滅▼寮�鍚按娉�/闃�闂�(AFN=0x92H/AFN=0xA2H)
private BaseResponse cdA2(){
ComCd92_A2Vo comVo = new ComCd92_A2Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
//comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
- comVo.icCardNo = CommandCtrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.icCardNo = CommandP206V202404Ctrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
comVo.waterRemain = 123.45 ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.moneyRemain = 234.56 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
comVo.waterPrice = 0.8 ;//姘撮噺鍗曚环 鍗曚綅:鍏�, 2涓皬鏁扮偣
@@ -208,9 +207,9 @@
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
private BaseResponse cd93(){
ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
- comVo.icCardNo = CommandCtrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.icCardNo = CommandP206V202404Ctrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
return this.sendCom2Mw(this.command(CodeV202404.cd_93, comVo, null)) ;
@@ -219,8 +218,8 @@
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
private BaseResponse cd9C(){
ComCd9CVo comVo = new ComCd9CVo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
comVo.icCardAddr = "04BEA5BB" ;//
return this.sendCom2Mw(this.command(CodeV202404.cd_9C, comVo, null)) ;
@@ -228,9 +227,9 @@
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
private BaseResponse cdA3(){
ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
- comVo.controllerType = CommandCtrl.controllerType ;
- comVo.projectNo = CommandCtrl.projectNo ;
- comVo.icCardNo = CommandCtrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.controllerType = CommandP206V202404Ctrl.controllerType ;
+ comVo.projectNo = CommandP206V202404Ctrl.projectNo ;
+ comVo.icCardNo = CommandP206V202404Ctrl.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
return this.sendCom2Mw(this.command(CodeV202404.cd_A3, comVo, null)) ;
--
Gitblit v1.8.0