From 6be968854d7a134cf31b8af7b8ffb219da5cee55 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 16:36:40 +0800
Subject: [PATCH] p206V1.0.0协议与硬件联调，并修改完善代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java
index 458f204..e9280fe 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_Up.java
@@ -4,7 +4,6 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V202404.*;
import com.dy.common.mw.protocol.p206V202404.parse.global.GlParse;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd80Vo;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd81Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
@@ -85,7 +84,7 @@
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV202404 dV1 = (DataV202404)data.getSubData() ;
- DataCd81Vo cdData = new DataCd81Vo() ;
+ DataCd81Vo cdData = new DataCd81Vo(CodeV202404.getCodeName(dataCode)) ;
dV1.subData = cdData ;
int index = ProtocolConstantV206V202404.dataIndex ;
@@ -95,6 +94,9 @@
cdData.projectNo = (int)bs[index];
index++ ;
- GlParse.parseAlarmAndState(bs, index, cdData) ;
+ cdData.rtuDt = GlParse.parseRtuDt(bs, index) ;
+
+ index += 6 ;
+ GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭
}
}
--
Gitblit v1.8.0