From a6205cbf1a93ea8f77a771de2dbd68c8f1e52ebe Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 02 八月 2024 13:25:46 +0800
Subject: [PATCH] 电磁锁新增临时电子围栏查询修改提交
---
ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
index b172d0e..566696f 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
@@ -1,5 +1,6 @@
package com.ruoyi.utils.mqtt;
+import com.ruoyi.alarm.global.service.IGlobalAlarmService;
import com.ruoyi.alarm.global.service.impl.GlobalAlarmServiceImpl;
import com.ruoyi.alarm.radar.service.ArdRadarService;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -38,13 +39,13 @@
*/
@Override
public void connectionLost(Throwable cause) {
- log.info("MQTT杩炴帴鏂紑锛屽彂璧烽噸杩�......");
+// log.info("MQTT杩炴帴鏂紑锛屽彂璧烽噸杩�......");
while (!client.isConnected()) {
try {
Thread.sleep(10000);
if (null != client && !client.isConnected()) {
client.reconnect();
- log.error("灏濊瘯閲嶆柊杩炴帴");
+// log.error("灏濊瘯閲嶆柊杩炴帴");
} else {
client.connect(options);
log.error("灏濊瘯寤虹珛鏂拌繛鎺�");
@@ -73,8 +74,9 @@
// subscribe鍚庡緱鍒扮殑娑堟伅浼氭墽琛屽埌杩欓噷闈�
log.debug("鎺ユ敹娑堟伅 銆愪富棰樸��:" + topic + " 銆愬唴瀹广��:" + new String(message.getPayload(), StandardCharsets.UTF_8));
//杩涜涓氬姟澶勭悊(鎺ユ敹鎶ヨ鏁版嵁)
- GlobalAlarmServiceImpl globalAlarmService = SpringUtils.getBean(GlobalAlarmServiceImpl.class);
+ IGlobalAlarmService globalAlarmService = SpringUtils.getBean(IGlobalAlarmService.class);
globalAlarmService.receiveAlarm(topic, new String(message.getPayload(), StandardCharsets.UTF_8));
+
if (topic.equals("minioEvent"))
{
IStorageMinioEventService storageMinioEventService = SpringUtils.getBean(IStorageMinioEventService.class);
@@ -86,13 +88,17 @@
StatisticalService statisticalService = SpringUtils.getBean(StatisticalService.class);
statisticalService.data(new String(message.getPayload(), StandardCharsets.UTF_8));
}
+ //鎺ユ敹闆疯揪寮哄埗寮曞鏁版嵁
if (topic.equals("radarForceGuide"))
{
ArdRadarService ardRadarService = SpringUtils.getBean(ArdRadarService.class);
ardRadarService.forceGuide(new String(message.getPayload(), StandardCharsets.UTF_8));
}
- if(topic.contains("/p")){
- System.out.println(new String(message.getPayload(), StandardCharsets.UTF_8));
+ //鎺ユ敹闆疯揪寮曞杩借釜鏁版嵁
+ if (topic.equals("radarFollowGuide"))
+ {
+ ArdRadarService ardRadarService = SpringUtils.getBean(ArdRadarService.class);
+ ardRadarService.followGuide(new String(message.getPayload(), StandardCharsets.UTF_8));
}
} catch (Exception e) {
log.debug("澶勭悊mqtt娑堟伅寮傚父:" + e);
@@ -108,8 +114,8 @@
if (null != topic && null != qos) {
if (client.isConnected()) {
client.subscribe(topic, qos);
- log.info("mqtt杩炴帴鎴愬姛" );
- log.info("--璁㈤槄涓婚:锛�" + Arrays.toString(topic));
+// log.info("mqtt杩炴帴鎴愬姛" );
+// log.info("璁㈤槄涓婚:" + Arrays.toString(topic));
} else {
log.info("mqtt杩炴帴澶辫触");
}
--
Gitblit v1.9.3