From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttPubMsgCache.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttPubMsgCache.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttPubMsgCache.java
index b4b948a..b4ae72a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttPubMsgCache.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttPubMsgCache.java
@@ -63,7 +63,8 @@
while(node != null && node.obj != null){
obj = (MqttPubMsgNode)node.obj;
pubMsg = obj.result ;
- if(pubMsg != null
+ if(!obj.onceReceivedResult
+ && pubMsg != null
&& subMsg.subMsgMatchPubMsg(pubMsg)){
obj.onceReceivedResult = true ;//鏍囪瘑宸茬粡鏀跺埌鍛戒护缁撴灉
return pubMsg;
@@ -86,7 +87,9 @@
while(node != null && node.obj != null){
obj = (MqttPubMsgNode)node.obj;
pubMsg = obj.result ;
- if(pubMsg != null && subMsg.subMsgMatchPubMsg(pubMsg)){
+ if(!obj.onceReceivedResult
+ && pubMsg != null
+ && subMsg.subMsgMatchPubMsg(pubMsg)){
obj.onceReceivedResult = true ;//鏍囪瘑宸茬粡鏀跺埌鍛戒护缁撴灉
return pubMsg;
}else{
--
Gitblit v1.8.0