From 49aaecfb0617b0e6043147c86f3d303e9f24867e Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@88.com>
Date: 星期三, 09 七月 2025 20:27:56 +0800
Subject: [PATCH] 修改yml配置

---
 src/main/java/com/fengdu/gas/host/mqtt/PushCallback.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fengdu/gas/host/mqtt/PushCallback.java b/src/main/java/com/fengdu/gas/host/mqtt/PushCallback.java
index af46fc6..1b019b6 100644
--- a/src/main/java/com/fengdu/gas/host/mqtt/PushCallback.java
+++ b/src/main/java/com/fengdu/gas/host/mqtt/PushCallback.java
@@ -3,13 +3,17 @@
 
 import com.fengdu.gas.common.enums.ELogger;
 import com.fengdu.gas.common.util.LoggerUtil;
+import com.fengdu.gas.common.util.SpringUtil;
 import com.fengdu.gas.common.util.ThreadPoolUtil;
+import com.fengdu.gas.service.DataUploadRecordService;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 
 ;
 
@@ -32,7 +36,8 @@
 public class PushCallback implements MqttCallback {
     private static final Logger LOGGER_DEBUG = LoggerUtil.get(ELogger.DEBUG);
     private static final Logger LOGGER_ERROR = LoggerUtil.get(ELogger.SYS_ERROR);
-
+    @Autowired
+    DataUploadRecordService dataUploadService;
     private MQTTSubsribe mqttSubsribe;
 
     public PushCallback(MQTTSubsribe mqttSubsribe) {
@@ -74,8 +79,20 @@
         //这里可以针对收到的消息做处理
         ThreadPoolUtil.getDefaultPool().execute(() -> {
             try {
-                //调用方法
-                //dataUploadYwjRecordService.mqttReceived(topic, msg);
+                if (Objects.nonNull(dataUploadService)) {
+                    //调用方法
+                    dataUploadService.mqttReceived(topic, msg);
+                } else {
+                    try {
+                        System.out.println("dataUploadService bean尚未初始化...");
+                        dataUploadService = SpringUtil.getBean(DataUploadRecordService.class);
+                        System.out.println("dataUploadService 初始化bean成功!");
+                    } catch (Exception ignored) {}
+                    if (Objects.nonNull(dataUploadService)) {
+                        //调用方法
+                        dataUploadService.mqttReceived(topic, msg);
+                    }
+                }
             } catch (Exception e) {
                 LOGGER_ERROR.error("messageArrived", e);
             }

--
Gitblit v1.9.3