From 06d79b2339046e2028bb32f72b93d729e1130523 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 05 十一月 2024 15:45:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_84_Up.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_84_Up.java
index 3860d97..be8fd85 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_84_Up.java
@@ -1,9 +1,11 @@
package com.dy.common.mw.protocol.p206V2.parse;
import com.dy.common.mw.protocol.*;
+import com.dy.common.mw.protocol.p206V1.CommonV1;
import com.dy.common.mw.protocol.p206V2.*;
import com.dy.common.mw.protocol.p206V2.parse.global.GlParse;
import com.dy.common.mw.protocol.p206V2.upVos.DataCd84Vo;
+import com.dy.common.mw.protocol.rtuState.ValveStateInfo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -33,6 +35,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,7 @@
downCpParams.setValue(
null,
ProtocolConstantV206V2.protocolName,
+ para.protocolVersion,
para.rtuAddr,
Command.defaultId,
confirmComCode,
@@ -56,6 +60,7 @@
MidResultToRtu confirmCommand = new MidResultToRtu() ;
confirmCommand.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ confirmCommand.protocolVersion = para.protocolVersion ;//鍗忚鐗堟湰鍙�
confirmCommand.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
confirmCommand.commandId = Command.defaultId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
confirmCommand.downCode = confirmComCode ;//涓嬭鍛戒护鍔熻兘鐮�;
@@ -73,6 +78,20 @@
}
callback.callback(midRs.reportOrResponse_trueOrFalse);
+ if(para.data != null && para.data.getSubData() != null){
+ DataCd84Vo cdData = (DataCd84Vo)((DataV2)para.data.getSubData()).subData ;
+ if(CommonV1.isCloseValveType(cdData.opType)){
+ callback.notify(new ValveStateInfo(false)) ;
+ }else{
+ callback.notify(new ValveStateInfo(true)) ;
+ }
+ /* 浠ヤ笅鍒ゆ柇闃�闂ㄥ紑鍚姩涓庡叧闂�佷笉鍙彇锛屽洜涓哄湪闃�鎵撳紑杩囩▼涓紝宸ヤ綔鎶ヤ腑鐨勯榾鐘舵�佷笉姝ｇ‘锛屼緥濡傚湪寮�鍚繃绋嬩腑闃�闂ㄧ姸鎬佹槸鍏抽棴鎬�
+ if(cdData.stateVo != null && cdData.stateVo.valveState != null){
+ callback.notify(new ValveStateInfo(cdData.stateVo.valveState.byteValue()== 1?false:true));
+ }
+ */
+ }
+
return new MidResult[]{midRs, confirmCommand} ;
}
/**
--
Gitblit v1.8.0