From f3d3eacf5af65ebfcfcc3b82e7488401ac545453 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 16 五月 2024 17:31:18 +0800 Subject: [PATCH] 完善王江海制定协议的实现代码。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java index f15eed4..e7b5ec2 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java @@ -3,6 +3,7 @@ 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.DataCd02Vo; import com.dy.common.mw.protocol.p206V202404.upVos.DataCdC2Vo; import com.dy.common.util.ByteUtil; @@ -53,7 +54,7 @@ para.data.subData==null?null:(((DataV202404)para.data.subData).subData), null); //鏋勯�犲簲绛� - byte[] data = new Cd_02_Down().doParse(downCpParams) ; + byte[] data = new Cd_C2_Down().doParse(downCpParams) ; MidResultToRtu confirmCommand = new MidResultToRtu() ; confirmCommand.protocolName = para.protocolName ;//鍗忚鍚嶇О @@ -106,5 +107,12 @@ cdData.success = true ; }else{ cdData.success = false ; - } } + } + + index++ ; + GlParse.parseRtuDt(bs, index); + + index+= 6 ; + GlParse.parseAlarmAndState(bs, index, cdData); + } } -- Gitblit v1.8.0