From fb9b202e2d421d7ee4e6879ae1232e481a3c6fa1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 25 七月 2024 16:53:22 +0800
Subject: [PATCH] 1、完善协议解析代码； 2、测试系统增加功能码为99、A0命令测试。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
index dd96f44..02e12ef 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd02Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -44,11 +45,12 @@
String confirmComCode = para.upCode ;
ParseParamsForDownV1_0_1 downCpParams = new ParseParamsForDownV1_0_1() ;
downCpParams.setValue(
+ null,
ProtocolConstantV206V1_0_0.protocolName,
para.rtuAddr,
Command.defaultId,
confirmComCode,
- null,
+ para.data!=null?(para.data.subData!=null?(((DataV1_0_1)(para.data.subData)).subData):null):null,
null);
//鏋勯�犲簲绛�
byte[] data = new Cd_02_Down().doParse(downCpParams) ;
@@ -83,7 +85,7 @@
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
DataCd02Vo cdData = new DataCd02Vo() ;
- dV1.dataCd02Vo = cdData ;
+ dV1.subData = cdData ;
cdData.status = ByteUtil.bytes2Hex(bs, false, ProtocolConstantV206V1_0_0.dataIndex, 1) ;
}
}
--
Gitblit v1.8.0