diff --git a/agri-framework/src/main/java/com/agri/framework/interceptor/MqttMessageHandler.java b/agri-framework/src/main/java/com/agri/framework/interceptor/MqttMessageHandler.java
index 97f43c6..d4b65bc 100644
--- a/agri-framework/src/main/java/com/agri/framework/interceptor/MqttMessageHandler.java
+++ b/agri-framework/src/main/java/com/agri/framework/interceptor/MqttMessageHandler.java
@@ -348,7 +348,7 @@ public class MqttMessageHandler implements SmartLifecycle {
             }
             if (!isValidStatus) {
                 log.debug("【设备状态包】结构不合法（非8个功能码），跳过Redis写入，deviceId={}；payload={}", deviceId, payload);
-            } else {
+            } else if(hasAutoOffTask(deviceId)){
                 // ✅ 8个功能码状态包：无条件写device:latest:{deviceId}，避免自动关读不到最新状态
                 stringRedisTemplate.opsForValue().set(
                         "device:latest:" + deviceId,
@@ -472,7 +472,6 @@ public class MqttMessageHandler implements SmartLifecycle {
             //todo
             mqttMessageSender.publish(deviceTopic, down.toJSONString());
             log.info("【自动关任务】检测仍在运行，已下发关闭：deviceId={}, funcType={}, payload={}", deviceId, funcType, down.toJSONString());
-            Boolean deleteSuccess = stringRedisTemplate.delete("device:latest:" + deviceId);
         } else {
             log.info("【自动关任务】检测未运行或状态未知，跳过关闭：deviceId={}, funcType={}, current={}", deviceId, funcType, current);
         }