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-common/src/main/java/com/dy/common/mw/protocol/Command.java | 15 --
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java | 3
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java | 3
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java | 7
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/Test.java | 199 +++++++++++++++++++++++++++++++++------
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/TestSupport.java | 18 +--
6 files changed, 184 insertions(+), 61 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
index 933e980..c979a5d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
@@ -44,11 +44,6 @@
* 鍔熻兘鐮�
*/
public String code ;
-
- /**
- * 涓嶈繑鍥炰腑闂翠欢瀵瑰懡浠ゅ鐞嗙粨鏋滐紙true锛氫笉杩斿洖澶勭悊缁撴灉锛宖alse鎴杗ull锛氳繑鍥炲鐞嗙粨鏋滐級
- */
- public Boolean noRtMwDealRes ;
/**
* rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
@@ -71,7 +66,7 @@
s += (rtuAddr == null ? "" : ("Rtu鍦板潃=" + rtuAddr + "\n"));
s += "鍛戒护绫诲瀷=" + (type.equals(CommandType.innerCommand)?"鍐呴儴鍛戒护":"RTU鍛戒护") + "\n" ;
s += (code == null ? "" : ("鍔熻兘鐮�=" + code + "\n")) ;
- s += "鏄惁杩斿洖涓棿浠跺鍛戒护澶勭悊缁撴灉=" + (noRtMwDealRes == null?"鏄�":(noRtMwDealRes?"鏄�":"鍚�") + "\n") ;
+ s += (rtuResultSendWebUrl == null ? "" : ("鍥炶皟缃戝潃=" + rtuResultSendWebUrl + "\n"));
if(param != null){
s += "鍙傛暟:" + param ;
}
@@ -205,14 +200,6 @@
public Command setCode(String code) {
this.code = code;
return this ;
- }
- @SuppressWarnings("unused")
- public Boolean getNoRtMwDealRes() {
- return noRtMwDealRes;
- }
- @SuppressWarnings("unused")
- public void setNoRtMwDealRes(Boolean noRtMwDealRes) {
- this.noRtMwDealRes = noRtMwDealRes;
}
public Object getParam() {
return param;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java
index a96dba4..df10fe0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java
@@ -70,6 +70,7 @@
if(hasRecord == 1){
//鏈夎褰�
List<DataCd55Vo> list = new ArrayList<>() ;
+ index++ ;
DataCd55Vo vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
while(vo != null){
index += 35 ;
@@ -83,7 +84,7 @@
}
private DataCd55Vo doParseData(byte[] bs, int index, int bsLen, String dataCode, String controllerType,Integer projectNo) throws Exception{
- //姣忔潯鏁版嵁鍗�39瀛楄妭
+ //姣忔潯鏁版嵁鍗�35瀛楄妭
if(bsLen - index > 35){
DataCd55Vo cdData = new DataCd55Vo(CodeV202404.getCodeName(dataCode)) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java
index 8c02c77..9acc765 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java
@@ -70,6 +70,7 @@
if(hasRecord == 1){
//鏈夎褰�
List<DataCd5CVo> list = new ArrayList<>() ;
+ index++ ;
DataCd5CVo vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
while(vo != null){
index += 16 ;
@@ -83,7 +84,7 @@
}
private DataCd5CVo doParseData(byte[] bs, int index, int bsLen, String dataCode, String controllerType,Integer projectNo) throws Exception{
- //姣忔潯鏁版嵁鍗�39瀛楄妭
+ //姣忔潯鏁版嵁鍗�16瀛楄妭
if(bsLen - index > 16){
DataCd5CVo cdData = new DataCd5CVo(CodeV202404.getCodeName(dataCode)) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
index 7fd3e85..4e2fa05 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
@@ -70,9 +70,10 @@
if(hasRecord == 1){
//鏈夎褰�
List<DataCd65Vo> list = new ArrayList<>() ;
+ index++ ;
DataCd65Vo vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
while(vo != null){
- index += 39 ;
+ index += 43 ;
list.add(vo) ;
vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
}
@@ -83,8 +84,8 @@
}
private DataCd65Vo doParseData(byte[] bs, int index, int bsLen, String dataCode, String controllerType,Integer projectNo) throws Exception{
- //姣忔潯鏁版嵁鍗�39瀛楄妭
- if(bsLen - index > 39){
+ //姣忔潯鏁版嵁鍗�43瀛楄妭
+ if(bsLen - index > 43){
DataCd65Vo cdData = new DataCd65Vo(CodeV202404.getCodeName(dataCode)) ;
cdData.controllerType = controllerType ;
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)) ;
+ }
+
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/TestSupport.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/TestSupport.java
index 016370f..b94f6a5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/TestSupport.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/TestSupport.java
@@ -26,19 +26,16 @@
protected static String rtuAddr = "37142501020100215" ;
protected static String rtuResultSendWebUrl = "http://127.0.0.1:8080/test" ;
- protected static String controllerType = "57" ;
- protected static Integer projectNo = 10 ;
+ protected static String controllerType = "57" ;//鎺у埗鍣ㄧ被鍨�
+ protected static Integer projectNo = 10 ;//椤圭洰缂栫爜
- protected static String icCardAddr = "04BEA5BB" ;
- protected static String icCardNo = "04BEA5BB" ;
+ protected static String icCardAddr = "04BEA5BB" ;//IC鍗″湴鍧�
+ protected static String icCardNo = "37142501020500001" ;//IC鍗＄紪鍙凤紙鐢ㄦ埛鍗″簭鍒楀彿锛�
-
- private RestTemplate restTemplate;
@Autowired
- public void setRestTemplate(RestTemplate restTemplate){
- this.restTemplate = restTemplate ;
- }
+ private RestTemplate restTemplate;
+
protected ComCdXyVo comCdXyVo(){
ComCdXyVo comVo = new ComCdXyVo() ;
@@ -54,7 +51,6 @@
com.code = code ;
com.rtuAddr = rtuAddr ;
com.type = CommandType.outerCommand ;
- com.noRtMwDealRes = false ;
com.rtuResultSendWebUrl = rtuResultSendWebUrl ;
com.param = param ;
@@ -79,7 +75,6 @@
} catch (Exception e) {
e.printStackTrace();
}
- assert response != null;
return response.getBody();
}
@@ -100,7 +95,6 @@
} catch (Exception e) {
e.printStackTrace();
}
- assert response != null;
return response.getBody();
}
--
Gitblit v1.8.0