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-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java
index 0fb914a..0a6a028 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java
@@ -2,6 +2,7 @@
import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.client.mqttv3.MqttClient;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,17 +19,30 @@
@RestController
@RequestMapping(path = "mqtt")
public class TestController {
+
+ @Value("${mqtt.broker}")
+ private String broker;
+
+ @Value("${mqtt.username}")
+ private String username;
+
+ @Value("${mqtt.password}")
+ private String password;
+
+ @Value("${mqtt.topic}")
+ private String topic;
+
+ @Value("${mqtt.qos}")
+ private Integer qos;
+
@GetMapping("/mqtt/{msg}")
public String testSendMqttMsg(@PathVariable("msg") String msg){
log.info("娑堟伅鍐呭锛歿}.", msg);
- MqttClient mqttClient = MqttClientConnectorPool.connectMQTT();
+ MqttClient mqttClient = MqttClientConnectorPool.connectMQTT(broker, username, password);
MqttMsgSender sender = new MqttMsgSender();
String content = "{" + " \"message\": \"" + msg + "\"," + " \"val\": 100.00" + "}";
-
- String topic = "workOrder";
- int qos = 1;
if (null != mqttClient){
sender.sendMessage(mqttClient, topic, content, qos);
--
Gitblit v1.8.0