From e407fcf19e50ed0972e7262d99da4b3a83d08706 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 17:08:23 +0800
Subject: [PATCH] 1、修改协议驱动RTU上行数据解析出错时，RTU上下行数据日志中的RTU地址不正确的bug; 2、83功能码上行数据测试main方法实现。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Up.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Up.java
index 21c9233..e65bd1e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_38_Up.java
@@ -2,6 +2,8 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd38And68Vo;
+import com.dy.common.util.ByteUtil;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -56,11 +58,11 @@
* @throws Exception 寮傚父
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
-// DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
-// DataCd38Vo cdData = new DataCd38Vo() ;
-// dV1.subData = cdData ;
-// int remainMoneyAlarmInt = ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V1_0_0.dataIndex) ;
-// cdData.remainMoneyAlarm = remainMoneyAlarmInt/100.0D;
+ DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
+ DataCd38And68Vo cdData = new DataCd38And68Vo() ;
+ dV1.subData = cdData ;
+ int remainMoneyAlarmInt = ByteUtil.BCD2Int_LE(bs, ProtocolConstantV206V1_0_0.dataIndex, ProtocolConstantV206V1_0_0.dataIndex + 1) ;
+ cdData.remainMoneyAlarm = remainMoneyAlarmInt/100.0D;
}
}
--
Gitblit v1.8.0