From cf3aaffad0b0f858c869bb21c9a01bf778dd8adc Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 05 十一月 2024 15:27:06 +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 | 7 +++++++
1 files changed, 7 insertions(+), 0 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 93232bf..7ecbfbf 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,9 @@
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;
import org.apache.logging.log4j.Logger;
@@ -37,6 +39,7 @@
MidResultFromRtu midRs = new MidResultFromRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.protocolVersion = para.protocolVersion; //鍗忚鐗堟湰鍙�
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.upCode = para.upCode ;//涓婅鏁版嵁涓殑鍔熻兘鐮�
midRs.upHex = para.upHex ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
@@ -46,6 +49,10 @@
midRs.reportOrResponse_trueOrFalse = false ;//涓诲姩涓婃姤
callback.callback(midRs.reportOrResponse_trueOrFalse);
+ if(para.data != null && para.data.getSubData() != null){
+ DataCd99Vo subData = (DataCd99Vo)((DataV1)para.data.getSubData()).subData ;
+ callback.notify(new ValveStateInfo(subData.success));
+ }
return new MidResult[]{midRs} ;
}
/**
--
Gitblit v1.8.0