From 7a30cb7329eb065d9a95213b327818412c2d5d0e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 03 三月 2025 14:22:22 +0800
Subject: [PATCH] 1、表阀一体机新协议解析优化； 2、取水口实体编辑更新逻辑修改，去除引起bug的代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_92_Up.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_92_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_92_Up.java
index bad5ec2..13256f2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_92_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_92_Up.java
@@ -2,8 +2,6 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1.*;
-import com.dy.common.mw.protocol.p206V1.upVos.DataCd83CloseVo;
-import com.dy.common.mw.protocol.p206V1.upVos.DataCd83OpenVo;
import com.dy.common.mw.protocol.p206V1.upVos.DataCd92Vo;
import com.dy.common.mw.protocol.rtuState.ValveStateInfo;
import com.dy.common.util.ByteUtil;
@@ -30,7 +28,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,9 +48,9 @@
midRs.reportOrResponse_trueOrFalse = false ;//涓诲姩涓婃姤
- callback.callback(midRs.reportOrResponse_trueOrFalse);
+ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV1)(para.data.subData)).subData);
if(para.data != null && para.data.getSubData() != null){
- DataCd92Vo subData = (DataCd92Vo)para.data.getSubData() ;
+ DataCd92Vo subData = (DataCd92Vo)((DataV1)para.data.getSubData()).subData ;
callback.notify(new ValveStateInfo(subData.success));
}
return new MidResult[]{midRs} ;
--
Gitblit v1.8.0