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 |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 d968436..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
@@ -69,12 +69,18 @@
     public void messageArrived(String topic, MqttMessage message) {
         try {
             // subscribe鍚庡緱鍒扮殑娑堟伅浼氭墽琛屽埌杩欓噷闈�
-            log.debug("鎺ユ敹娑堟伅 銆愪富棰樸��:" + 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));
             }
@@ -92,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