From 5fcdef2e8eec55221bb65a7a2cf91a4be7cc89ac Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 02 十二月 2024 16:41:11 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_99_Up.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_99_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_99_Up.java index d9bbed8..7b0102f 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_99_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_99_Up.java @@ -3,7 +3,6 @@ import com.dy.common.mw.protocol.*; import com.dy.common.mw.protocol.p206V1.*; import com.dy.common.mw.protocol.p206V1.parse.global.GlParse; -import com.dy.common.mw.protocol.p206V1.upVos.DataCd98Vo; import com.dy.common.mw.protocol.p206V1.upVos.DataCd99Vo; import com.dy.common.mw.protocol.rtuState.ValveStateInfo; import org.apache.logging.log4j.LogManager; @@ -28,7 +27,7 @@ @Override public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception { ParseParamsForUpV1 para = (ParseParamsForUpV1)params ; - int bsLen = new CommonV1().parseDataLen(para.upBuffer) ; + int bsLen = new CommonV1().parseDataLen4P206(para.upBuffer) ; if(bsLen > 0){ this.doParse(para.upBuffer, bsLen, @@ -50,7 +49,7 @@ callback.callback(midRs.reportOrResponse_trueOrFalse); if(para.data != null && para.data.getSubData() != null){ - DataCd99Vo subData = (DataCd99Vo)para.data.getSubData() ; + DataCd99Vo subData = (DataCd99Vo)((DataV1)para.data.getSubData()).subData ; callback.notify(new ValveStateInfo(subData.success)); } return new MidResult[]{midRs} ; -- Gitblit v1.8.0