From 70f61b0638e32274d0e5f9b972ce2a18f139f1b4 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 12 六月 2025 09:51:30 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttPubMsgNode.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttPubMsgNode.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttPubMsgNode.java
index 7b827d5..504ee3f 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttPubMsgNode.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttPubMsgNode.java
@@ -65,7 +65,7 @@
}else{
if(mqttClient != null && mqttClient.isConnected()){
try {
- mqttManager.publishMsg(mqttClient, this.result.topic, this.result.msg);
+ mqttManager.publishMsg(mqttClient, this.result.topic.longName(), this.result.msg);
DevStatusDealer.afterSendPubMessage(this.result.deviceId);
RtuLogDealer.log4Mqtt(this.result.deviceId, "鍙戝竷娑堟伅 涓婚锛�" + this.result.topic + " 娑堟伅锛�" + this.result.msg);
log.info("鍙戝竷MQTT娑堟伅锛堜富棰�=" + this.result.topic + "锛�" + this.result.msg);
@@ -74,7 +74,11 @@
}finally {
mqttManager.pushMqttClient(mqttClient);
}
- return false ;
+ if(this.result.hasResponse){
+ return false ;
+ }else{
+ return true ;
+ }
}else{
//鏈浘杩炴帴MQTT鏈嶅姟鍣�
return this.decideRemoveNodeFromCach(now) ;
--
Gitblit v1.8.0