From db88628e7bb03f334fa65826bd655c27859a9973 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 03 十一月 2024 16:52:04 +0800
Subject: [PATCH] 1、协议版本号增加到协议解析与命令构造中； 2、增加RTU状态记录功能，为RTU远程升级做准备。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java
index 82871ce..060e4f5 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java
@@ -5,6 +5,7 @@
import com.dy.common.mw.protocol.p206V202404.*;
import com.dy.common.mw.protocol.p206V202404.parse.global.GlParse;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd85Vo;
+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;
@@ -30,10 +31,11 @@
para.upCode,
para.data) ;
}
- log.info("鍒嗘瀽涓婅鏁版嵁<" + CodeV202404.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
+ log.info("\n鍒嗘瀽涓婅鏁版嵁<" + CodeV202404.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
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 +49,7 @@
downCpParams.setValue(
null,
ProtocolConstantV206V202404.protocolName,
+ para.protocolVersion,
para.rtuAddr,
Command.defaultId,
confirmComCode,
@@ -57,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 +77,10 @@
confirmCommand.isQuickSend = true ;
}
callback.callback(midRs.reportOrResponse_trueOrFalse);
+ if(para.data != null && para.data.getSubData() != null){
+ callback.notify(new ValveStateInfo(false));
+ }
+
return new MidResult[]{midRs, confirmCommand} ;
}
/**
--
Gitblit v1.8.0