From 2b29a4a26019e3d1692c4b4c76746dba9fac7b22 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 07 十月 2023 14:39:16 +0800
Subject: [PATCH] 报警数量统计年

---
 ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 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 aa334a5..62a2ca2 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,7 +1,8 @@
 package com.ruoyi.utils.mqtt;
 
-import com.ruoyi.alarm.globalAlarm.service.impl.GlobalAlarmServiceImpl;
+import com.ruoyi.alarm.global.service.impl.GlobalAlarmServiceImpl;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.storage.minio.service.IStorageMinioEventService;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
 
@@ -36,9 +37,9 @@
     @Override
     public void connectionLost(Throwable cause) {
         log.info("MQTT杩炴帴鏂紑锛屽彂璧烽噸杩�......");
-        try {
-            while (!client.isConnected()) {
-                Thread.sleep(5000);
+        while (!client.isConnected()) {
+            try {
+                Thread.sleep(10000);
                 if (null != client && !client.isConnected()) {
                     client.reconnect();
                     log.error("灏濊瘯閲嶆柊杩炴帴");
@@ -46,9 +47,9 @@
                     client.connect(options);
                     log.error("灏濊瘯寤虹珛鏂拌繛鎺�");
                 }
+            } catch (Exception e) {
+                log.error("鏂紑閲嶈繛寮傚父:" + e.getMessage());
             }
-        } catch (Exception e) {
-            e.printStackTrace();
         }
     }
 
@@ -68,12 +69,23 @@
     public void messageArrived(String topic, MqttMessage message) {
         try {
             // subscribe鍚庡緱鍒扮殑娑堟伅浼氭墽琛屽埌杩欓噷闈�
-            log.info("鎺ユ敹娑堟伅 銆愪富棰樸��:" + topic + " 銆愬唴瀹广��:" + new String(message.getPayload()));
+            log.debug("鎺ユ敹娑堟伅 銆愪富棰樸��:" + topic + " 銆愬唴瀹广��:" + new String(message.getPayload(), StandardCharsets.UTF_8));
             //杩涜涓氬姟澶勭悊(鎺ユ敹鎶ヨ鏁版嵁)
             GlobalAlarmServiceImpl globalAlarmService = SpringUtils.getBean(GlobalAlarmServiceImpl.class);
             globalAlarmService.receiveAlarm(topic, new String(message.getPayload(), StandardCharsets.UTF_8));
+            if (topic.equals("minioEvent"))
+            {
+                IStorageMinioEventService storageMinioEventService = SpringUtils.getBean(IStorageMinioEventService.class);
+                storageMinioEventService.parseStorageMinioEvent(new String(message.getPayload(), StandardCharsets.UTF_8));
+            }
+            if (topic.equals("radarWellData"))
+            {
+                System.out.println(new String(message.getPayload(), StandardCharsets.UTF_8));
+                IStorageMinioEventService storageMinioEventService = SpringUtils.getBean(IStorageMinioEventService.class);
+                storageMinioEventService.parseStorageMinioEvent(new String(message.getPayload(), StandardCharsets.UTF_8));
+            }
         } catch (Exception e) {
-            log.info("澶勭悊mqtt娑堟伅寮傚父:" + e);
+            log.debug("澶勭悊mqtt娑堟伅寮傚父:" + e);
         }
     }
 
@@ -86,10 +98,10 @@
             if (null != topic && null != qos) {
                 if (client.isConnected()) {
                     client.subscribe(topic, qos);
-                    log.info("mqtt杩炴帴鎴愬姛锛屽鎴风ID锛�" + PropertiesUtil.MQTT_CLIENT_ID);
+                    log.info("mqtt杩炴帴鎴愬姛" );
                     log.info("--璁㈤槄涓婚:锛�" + Arrays.toString(topic));
                 } else {
-                    log.info("mqtt杩炴帴澶辫触锛屽鎴风ID锛�" + PropertiesUtil.MQTT_CLIENT_ID);
+                    log.info("mqtt杩炴帴澶辫触");
                 }
             }
         } catch (Exception e) {

--
Gitblit v1.9.3