From 4b32f94e12f0afab074eee93a96eeb722b5bb090 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 06 五月 2024 16:24:10 +0800
Subject: [PATCH] 实现王江海制定的协议驱动及具体功能码协议（部分）
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
index 15ff9f1..fd50a67 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
@@ -43,6 +43,7 @@
String confirmComCode = para.upCode ;
ParseParamsForDownV1_0_1 downCpParams = new ParseParamsForDownV1_0_1() ;
downCpParams.setValue(
+ null,
ProtocolConstantV206V1_0_0.protocolName,
para.rtuAddr,
Command.defaultId,
@@ -81,7 +82,6 @@
* @throws Exception 寮傚父
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
- short index = ProtocolConstantV206V1_0_0.dataIndex ;
byte opType = bs[ProtocolConstantV206V1_0_0.dataIndex];
if(opType == 1 || opType == 3 || opType == 8){
this.doParseOpen(opType, bs, bsLen, dataCode, data);
@@ -92,7 +92,7 @@
private void doParseOpen(byte opType, byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
DataCd83OpenVo cdData = new DataCd83OpenVo() ;
- dV1.dataCd83OpenVo = cdData ;
+ dV1.subData = cdData ;
cdData.type = opType ;
@@ -116,11 +116,11 @@
cdData.totalAmount += tpInt * 100000000.0 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.clientNum = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
+ cdData.icCardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
index += 5 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.clientNum = ByteUtil.bytesToHex(bs, index, index + 3) ;
+ cdData.icCardNo = ByteUtil.bytesToHex(bs, index, index + 3) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
@@ -150,7 +150,7 @@
private void doParseClose(byte opType, byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
DataCd83CloseVo cdData = new DataCd83CloseVo() ;
- dV1.dataCd83CloseVo = cdData ;
+ dV1.subData = cdData ;
cdData.type = opType ;
@@ -174,11 +174,11 @@
cdData.totalAmount += tpInt * 100000000.0 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.clientNum = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
+ cdData.icCardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
index += 5 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.clientNum = ByteUtil.bytesToHex(bs, index, index + 3) ;
+ cdData.icCardNo = ByteUtil.bytesToHex(bs, index, index + 3) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
--
Gitblit v1.8.0