From cd0d7f565f583b6575ac5801d69049b6de17c7e4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十二月 2023 11:40:52 +0800
Subject: [PATCH] 1、接入中间件代码完善; 2、继续实现通信协议5个功能码。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
index ad0b1b9..6d36ca9 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
@@ -8,7 +8,7 @@
 import org.apache.logging.log4j.Logger;
 
 @AnnotationCodeUp(ifAny={
-        CodeV1_0_1.cd_83
+        CodeV1_0_1.cd_84
 })
 @SuppressWarnings("unused")
 public class Cd_84_Up implements CodeParse {
@@ -40,9 +40,10 @@
 
         midRs.reportOrResponse_trueOrFalse = true ;//涓诲姩涓婃姤
 
-        String confirmComCode = CodeV1_0_1.cd_C0 ;
+        String confirmComCode = para.upCode ;
         ParseParamsForDownV1_0_1 downCpParams  = new ParseParamsForDownV1_0_1() ;
         downCpParams.setValue(
+                null,
                 ProtocolConstantV206V1_0_0.protocolName,
                 para.rtuAddr,
                 Command.defaultId,
@@ -61,9 +62,14 @@
         confirmCommand.downBufHex = ByteUtil.bytes2Hex(data, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
         confirmCommand.hasResponse = false ;//鏄惁鏈夊簲绛�
         confirmCommand.maxSendTimes = 1 ;//鍛戒护鏈�澶у彂閫佹鏁�(褰撴敹涓嶅埌搴旂瓟鏃讹紝灏嗛噸鍙�2娆�)锛屽鏋滀笉璁剧疆锛屽懡浠ょ紦瀛樺櫒杩涜琛ュ厖璁剧疆
-        confirmCommand.isSendFirst = true ;//纭鍛戒护锛屼紭鍏堝彂閫�
         confirmCommand.isCachForOffLine = false ;//RTU涓嶅湪绾匡紝鍛戒护鏄惁缂撳瓨
 
+        confirmCommand.isSendFirst = true ;//纭鍛戒护锛屼紭鍏堝彂閫�
+        if(isLowPower != null && isLowPower.booleanValue()){
+            //浣庡姛鑰楁椂锛屽敖蹇彂閫�
+            confirmCommand.isQuickSend = true ;
+        }
+
         callback.callback(midRs.reportOrResponse_trueOrFalse);
         return new MidResult[]{midRs, confirmCommand} ;
     }

--
Gitblit v1.8.0