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-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailable.java | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailable.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailable.java index f55f9ae..1058dc3 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailable.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailable.java @@ -3,6 +3,7 @@ import org.apache.mina.core.buffer.IoBuffer; import com.dy.common.mw.channel.tcp.PrefixedDataAvailableStatus; +import org.apache.mina.core.session.IoSession; public interface PrefixedDataAvailable { @@ -15,10 +16,11 @@ * @return 涓嶆椂鏈崗璁暟鎹椂杩斿洖绌� * @throws Exception 寮傚父 */ - PrefixedDataAvailableStatus forOnLine(IoBuffer in, - int remain, - int minDataLength, - int maxDataLength) throws Exception ; + PrefixedDataAvailableStatus forOnLine(IoSession ioSession, + IoBuffer in, + int remain, + int minDataLength, + int maxDataLength) throws Exception ; /** * 鍒嗘瀽涓婄嚎鍚�(缃戠粶杩炴帴鍚庨潪绗竴鍖呮暟鎹�)鏄惁鍙幏寰� @@ -29,9 +31,10 @@ * @return PrefixedDataAvailableStatus * @throws Exception 寮傚父 */ - PrefixedDataAvailableStatus forUpData(IoBuffer in, - int remain, - int minDataLength, - int maxDataLength) throws Exception; + PrefixedDataAvailableStatus forUpData(IoSession ioSession, + IoBuffer in, + int remain, + int minDataLength, + int maxDataLength) throws Exception; } -- Gitblit v1.8.0