From fbd4cf5aeb4274938c12030e5d235c65c20c19c3 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期三, 15 五月 2024 16:36:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_81_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/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..25b6deb 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.parseRtuDt(bs, index) ; + + index += 6 ; GlParse.parseAlarmAndState(bs, index, cdData) ; } } -- Gitblit v1.8.0