From cb7ca191bf7dfe5db4dc30f1576f8c5362761154 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 16 五月 2024 18:38:02 +0800 Subject: [PATCH] 修改bug,协议中报警及状态是4个字节,程序实现中当2个字节 --- 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 7fe4dd2..c22c292 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; @@ -92,9 +91,12 @@ cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ; index++ ; - cdData.projectNo = 0 + bs[index]; + 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