From 001738725075f0e0f110c6880e857f7490ab8510 Mon Sep 17 00:00:00 2001
From: wangwei_123 <1255324804@qq.com>
Date: Fri, 20 Mar 2026 13:10:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E8=A1=A8=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java     | 1 +
 .../iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java | 5 ++++-
 cc-admin-master/yudao-server/src/main/resources/application.yaml     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java
index 704e993..ce4fc7b 100644
--- a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java
+++ b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java
@@ -598,6 +598,7 @@ public class BatchDeviceMessageProcessor {
             // 发送报警结束消息
             sendAlarmMessage(handVo, alarmRule.getGasTypeName(), handVo.getValue(), false, context);
             handVo.setLastPushValue(null);
+            handVo.setLastPushLevel(null);
             HandAlarmDO alarmToEnd = new HandAlarmDO();
             alarmToEnd.setId(handVo.getAlarmId());
             alarmToEnd.setTAlarmEnd(now);
diff --git a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java
index 5d4d62d..b1ad1f8 100644
--- a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java
+++ b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java
@@ -62,7 +62,6 @@ public class HandAlarmMessageProcess {
             }
 
             // 3. 执行推送，收集实际成功推送的 SN 列表
-            // 【问题3 FIX】由 publishAlarmToMqtt 返回实际推送成功的列表，日志只记录成功项
             List<String> succeededSns = publishAlarmToMqtt(targetSns, event.getMsgContent());
 
             // 4. 记录报警消息日志（仅记录实际推送成功的 SN）
@@ -120,4 +119,8 @@ public class HandAlarmMessageProcess {
 
         return succeededSns;
     }
+
+    public static void main(String[] args) {
+
+    }
 }
\ No newline at end of file
diff --git a/cc-admin-master/yudao-server/src/main/resources/application.yaml b/cc-admin-master/yudao-server/src/main/resources/application.yaml
index be33b8a..5acf809 100644
--- a/cc-admin-master/yudao-server/src/main/resources/application.yaml
+++ b/cc-admin-master/yudao-server/src/main/resources/application.yaml
@@ -2,7 +2,7 @@ spring:
   application:
     name: gas_mobile
   profiles:
-    active: prod
+    active: dev
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。