From 7d56e2e80e641e1890cd64c46b4519d18f67efc7 Mon Sep 17 00:00:00 2001
From: chenyouting <514333061@qq.com>
Date: Sun, 28 Sep 2025 17:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E4=BF=A1=E6=81=AF=E5=92=8C?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=95=85=E9=9A=9C3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fuyuanshen/global/mqtt/rule/bjq/BjqModeRule.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqModeRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqModeRule.java
index 56bb514f..6b58b053 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqModeRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqModeRule.java
@@ -63,6 +63,12 @@ public class BjqModeRule implements MqttMessageRule {
                         updateWrapper.set("online_status", 2);
                         deviceService.update(updateWrapper);
                         RedisUtils.deleteObject(sendMessageIng);
+
+                        // 解除告警
+                        String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
+                        if(RedisUtils.getCacheObject(deviceRedisKey) != null){
+                            RedisUtils.deleteObject(deviceRedisKey);
+                        }
                     }
                 }
                 // 发送设备状态和位置信息到Redis