From be9748853c664402d88480167cd88bd781cf6b17 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 17 五月 2024 17:15:08 +0800
Subject: [PATCH] 1、完善协议实现代码； 2、模拟向控制器发送命令，实现所有可下发的命令代码。
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Test.java | 199 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 169 insertions(+), 30 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Test.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Test.java
index bb84e4d..b780784 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Test.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Test.java
@@ -1,9 +1,7 @@
package com.dy.pipIrrMwTestWeb.test;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd10Vo;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd15Vo;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd65Vo;
+import com.dy.common.mw.protocol.p206V202404.downVos.*;
import com.dy.common.webUtil.BaseResponse;
import org.springframework.stereotype.Component;
@@ -20,8 +18,9 @@
* @return
*/
public BaseResponse test(){
- //return this.connect() ;
- return this.cd50() ;
+ //return this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
+ //return this.cdXY(CodeV202404.cd_50) ;//鍙戦�佸浐瀹氬弬鏁扮殑鍛戒护
+ return this.cd65(2) ;
}
/**
@@ -32,6 +31,11 @@
return this.sendTest() ;
}
+ //鍙戦�佸浐瀹氬弬鏁扮殑鍛戒护
+ private BaseResponse cdXY(String code){
+ return this.sendCom2Mw(this.command(code, this.comCdXyVo(), null)) ;
+ }
+
//璁剧疆缁堢鍦板潃(AFN=0x10H)
private BaseResponse cd10(){
ComCd10Vo comVo = new ComCd10Vo() ;
@@ -40,38 +44,173 @@
comVo.rtuNewAddr = Test.rtuAddr ;
return this.sendCom2Mw(this.command(CodeV202404.cd_10, comVo, null)) ;
}
- //鏌ヨ璁惧缁堢鍦板潃(AFN=0x50H)
- private BaseResponse cd50(){
- return this.sendCom2Mw(this.command(CodeV202404.cd_50, this.comCdXyVo(), null)) ;
- }
- //鏌ヨ璁惧缁堢瀹炴椂鍊�(AFN=0x5BH)
- private BaseResponse cd5B(){
- return this.sendCom2Mw(this.command(CodeV202404.cd_5B, this.comCdXyVo(), null)) ;
- }
- //鏌ヨ璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍(AFN=0x65H)
- private BaseResponse cd65(){
- ComCd65Vo comVo = new ComCd65Vo() ;
- comVo.controllerType = Test.controllerType ;
- comVo.projectNo = Test.projectNo ;
- comVo.page = 1 ;
- return this.sendCom2Mw(this.command(CodeV202404.cd_65, comVo, null)) ;
- }
- //娓呴櫎璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍 (AFN=0x97H)
- private BaseResponse cd97(){
- return this.sendCom2Mw(this.command(CodeV202404.cd_97, this.comCdXyVo(), null)) ;
- }
- //杩滅▼鐢ㄦ埛鍏呭�� (AFN=0x15H)
+ //杩滅▼鐢ㄦ埛鍏呭�� (AFN=0x15H)
private BaseResponse cd15(){
ComCd15Vo comVo = new ComCd15Vo() ;
comVo.controllerType = Test.controllerType ;
comVo.projectNo = Test.projectNo ;
- comVo.icCardAddr = "" ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
- comVo.icCardNo = "" ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
+ comVo.icCardNo = Test.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
comVo.chargeMoney = 123.45 ;//鍗曚綅:鍏� 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
- comVo.chargeWater = 123.45 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
- comVo.flowNo = "" ;//娴佹按鍙凤紙12浣嶆暟瀛楋級
+ comVo.chargeWater = 234.56 ;//鍗曚綅:m3 2浣嶅皬鏁扮偣(鏈�澶у�� 99999999.99)
+ comVo.flowNo = "123456789012" ;//娴佹按鍙凤紙12浣嶆暟瀛楋級
+ return this.sendCom2Mw(this.command(CodeV202404.cd_15, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢鍓╀綑姘撮噺鍜屽墿浣欓噾棰濇姤璀﹀�� (AFN=0x16H)
+ private BaseResponse cd16(){
+ ComCd16Vo comVo = new ComCd16Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ comVo.waterAlarm = 10 ;//鍓╀綑姘撮噺鎶ヨ鍊�,鍗曚綅:m3銆傛暣鏁帮紝鍙栧�艰寖鍥�0~9999
+ comVo.moneyAlarm = 11 ;//鍓╀綑閲戦鎶ヨ鍊�,鍗曚綅:鍏冦�傛暣鏁帮紝鍙栧�艰寖鍥�0~9999
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_16, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢IP鍦板潃 (AFN=0x21H)
+ private BaseResponse cd21(){
+ ComCd21Vo comVo = new ComCd21Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
+ comVo.ip = "111.222.123.321" ;//IP锛堜緥濡� 125.235.35.89锛�
+ comVo.port = 60000 ;///绔彛鍙凤紙0~65536锛�
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_21, comVo, null)) ;
+ }
+ //璁剧疆鏈轰簳骞存渶澶у紑閲囬噺鍜屾按浣嶄笅闄� (AFN=0x22H)
+ private BaseResponse cd22(){
+ ComCd22Vo comVo = new ComCd22Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ comVo.maxAmountYear = 12345 ;//鏈轰簳骞存渶澶х敤姘撮噺鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
+ comVo.limitLevel = 123.4; //姘翠綅涓嬮檺 鍗曚綅锛歮 鍙栧�艰寖鍥�:0~9999.99
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_22, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢鍩熷悕(AFN=0x23H)
+ private BaseResponse cd23(){
+ ComCd23Vo comVo = new ComCd23Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ comVo.channel = 1 ;//IP閫氶亾鍙�(鍙栧�艰寖鍥� 1銆�2).
+ comVo.domain = "www.baidu.com" ;//鍩熷悕锛堜緥濡� dayuyanjiuyuan.to锛夛紝鏈�澶ч暱搴�42瀛楃
+ comVo.port = 60000 ;///绔彛鍙凤紙0~65536锛�
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_23, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢娉ㄥ唽鍙�(AFN=0x24H)
+ private BaseResponse cd24(){
+ ComCd24Vo comVo = new ComCd24Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ comVo.registerNo = "102030405060708090" ;//鍩熷悕锛堜緥濡� dayuyanjiuyuan.to锛夛紝鏈�澶ч暱搴�42瀛楃
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_24, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢骞寸敤姘撮噺(AFN=0x24H)
+ private BaseResponse cd26(){
+ ComCd26Vo comVo = new ComCd26Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ comVo.ipChannel = 1 ;//IP閫氶亾鍙� 0x01:1閫氶亾 0x02:2閫氶亾.
+ comVo.maxAmountYear = 123456 ;//璁惧缁堢骞寸敤姘撮噺 鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_26, comVo, null)) ;
+ }
+ //璁剧疆璁惧缁堢鐢ㄦ按鏈夋晥(AFN=0x31H)
+ private BaseResponse cd31(){
+ ComCd31Vo comVo = new ComCd31Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ comVo.valid = false ;//鏈夋晥鎬�
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_31, comVo, null)) ;
+ }
+ //鏌ヨ閬ユ祴缁堢鍏呭�艰褰� (AFN=0x55H)
+ private BaseResponse cd55(int page){
+ ComCd55Vo comVo = new ComCd55Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ comVo.page = page ;//鍒嗛〉锛堝彇鍊艰寖鍥�1銆�2銆�3銆�4銆�5銆�6銆�7銆�8銆�9锛�
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_55, comVo, null)) ;
+ }
+ //鏌ヨ璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍(AFN=0x65H)
+ private BaseResponse cd65(int page){
+ ComCd65Vo comVo = new ComCd65Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.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 = Test.controllerType ;
+ comVo.projectNo = Test.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 = Test.controllerType ;
+ comVo.projectNo = Test.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 = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ //comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
+ comVo.icCardNo = Test.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涓皬鏁扮偣
+ comVo.elePrice = 1.2 ;//鐢甸噺鍗曚环 鍗曚綅:鍏�, 2涓皬鏁扮偣
+ comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_92, comVo, null)) ;
+ }
+ //骞冲彴/APP杩滅▼寮�鍚按娉�/闃�闂�(AFN=0x92H/AFN=0xA2H)
+ private BaseResponse cdA2(){
+ ComCd92_A2Vo comVo = new ComCd92_A2Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ //comVo.icCardAddr = Test.icCardAddr ;//IC鍗″湴鍧�(8浣嶆暟瀛楁垨瀛楁瘝)
+ comVo.icCardNo = Test.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涓皬鏁扮偣
+ comVo.elePrice = 1.2 ;//鐢甸噺鍗曚环 鍗曚綅:鍏�, 2涓皬鏁扮偣
+ comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_A2, comVo, null)) ;
+ }
+
+ //骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
+ private BaseResponse cd93(){
+ ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ comVo.icCardNo = Test.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_93, comVo, null)) ;
+ }
+ //骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�(AFN=0x93H/AFN=0xA3H)
+ private BaseResponse cdA3(){
+ ComCd93_A3Vo comVo = new ComCd93_A3Vo() ;
+ comVo.controllerType = Test.controllerType ;
+ comVo.projectNo = Test.projectNo ;
+ comVo.icCardNo = Test.icCardNo ;//鐢ㄦ埛鍗″簭鍒楀彿锛�17浣嶆暟瀛楋級锛�6瀛楄妭BCD锛�2瀛楄妭HEX锛�
+ comVo.orderNo = "1234567890123456" ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+
+ return this.sendCom2Mw(this.command(CodeV202404.cd_A3, comVo, null)) ;
+ }
+
}
--
Gitblit v1.8.0