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/p206V202404/parse/Cd_65_Up.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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 ;
--
Gitblit v1.8.0