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/p206V1/parse/Cd_83_Up.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
index 05ed673..75ca70d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
@@ -3,8 +3,10 @@
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.DataCd81Vo;
import com.dy.common.mw.protocol.p206V1.upVos.DataCd83CloseVo;
import com.dy.common.mw.protocol.p206V1.upVos.DataCd83OpenVo;
+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;
@@ -34,6 +36,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 ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
@@ -47,6 +50,7 @@
downCpParams.setValue(
null,
ProtocolConstantV206V1.protocolName,
+ para.protocolVersion,
para.rtuAddr,
Command.defaultId,
confirmComCode,
@@ -57,6 +61,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 ;//涓嬭鍛戒护鍔熻兘鐮�;
@@ -72,6 +77,14 @@
//浣庡姛鑰楁椂锛屽敖蹇彂閫�
confirmCommand.isQuickSend = true ;
}
+ if(para.data != null && para.data.getSubData() != null){
+ Object subData = ((DataV1)para.data.getSubData()).subData ;
+ if(subData instanceof DataCd83OpenVo){
+ callback.notify(new ValveStateInfo(true));
+ }else if(subData instanceof DataCd83CloseVo){
+ callback.notify(new ValveStateInfo(false));
+ }
+ }
callback.callback(midRs.reportOrResponse_trueOrFalse);
return new MidResult[]{midRs, confirmCommand} ;
--
Gitblit v1.8.0