From 87a2fe3e6f1472a7e87e02d3fd956eee17b85352 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 12 十月 2023 15:28:33 +0800
Subject: [PATCH] 抽油机状态入库

---
 ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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 d6e12c1..7e2a2d3 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
@@ -2,6 +2,8 @@
 
 import com.ruoyi.alarm.global.service.impl.GlobalAlarmServiceImpl;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.statistical.service.StatisticalService;
+import com.ruoyi.storage.minio.service.IStorageMinioEventService;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
 
@@ -68,12 +70,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));
+                StatisticalService statisticalService = SpringUtils.getBean(StatisticalService.class);
+                statisticalService.data(new String(message.getPayload(), StandardCharsets.UTF_8));
+            }
         } catch (Exception e) {
-            log.info("澶勭悊mqtt娑堟伅寮傚父:" + e);
+            log.debug("澶勭悊mqtt娑堟伅寮傚父:" + e);
         }
     }
 
@@ -86,10 +99,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