From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:34 +0800
Subject: [PATCH] （1）升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败； （2）升级状态向Remote模块通知时，当升级任务结束后，仍要向remote模块通知可配置的次数；
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpData.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpData.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpData.java
index f18558b..1a89bd5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpData.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpData.java
@@ -1,7 +1,7 @@
package com.dy.pipIrrMwTestRtu.tcpClient.upData;
-import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
-import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
+import com.dy.common.mw.protocol.p206V1.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
import org.apache.mina.core.session.IoSession;
@@ -27,21 +27,21 @@
}
protected static byte[] creatHead(String rtuAddr, String code, byte ctrl)throws Exception {
- byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code] ;
+ byte[] bsHead = new byte[ProtocolConstantV206V1.lenHead2Code] ;
byte index = 0 ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ bsHead[index] = ProtocolConstantV206V1.P_Head_Byte ;
index++ ;
bsHead[index] = 0 ;//甯ч暱搴�
index++ ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ bsHead[index] = ProtocolConstantV206V1.P_Head_Byte ;
index++ ;
bsHead[index] = ctrl; //鎺у埗鍩熷姛鑳界爜
index++ ;
- GlCreate.createRtuAddr(rtuAddr, bsHead, index);
+ GlCreate.createRtuAddr4P206(rtuAddr, bsHead, index);
index += 5 ;
ByteUtil.hex2Bytes(code, bsHead, index) ;
--
Gitblit v1.8.0