From 43a19a4424f67c379934ed0d70e0d1b3512cd769 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 27 三月 2025 09:31:44 +0800
Subject: [PATCH] 灌溉计划表中增加项目ID字段,计划列表返回值中增加项目名称,项目状态改为整数表示
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_A0_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_A0_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_A0_Up.java
index b9c3eac..632aa5d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_A0_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_A0_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.DataCd99Vo;
import com.dy.common.mw.protocol.p206V1.upVos.DataCdA0Vo;
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,
@@ -48,7 +47,7 @@
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){
DataCdA0Vo subData = (DataCdA0Vo)((DataV1)para.data.getSubData()).subData ;
callback.notify(new ValveStateInfo(subData.success));
--
Gitblit v1.8.0