From 8aea4544171f76a4ebc9cc4c6c23efa40decaf0d Mon Sep 17 00:00:00 2001
From: lld <15027638633@163.com>
Date: Fri, 6 Mar 2026 23:13:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=87=AA=E5=8A=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/agri/framework/interceptor/DeviceStatusHandler.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/agri-framework/src/main/java/com/agri/framework/interceptor/DeviceStatusHandler.java b/agri-framework/src/main/java/com/agri/framework/interceptor/DeviceStatusHandler.java
index 07fd71e..28c0910 100644
--- a/agri-framework/src/main/java/com/agri/framework/interceptor/DeviceStatusHandler.java
+++ b/agri-framework/src/main/java/com/agri/framework/interceptor/DeviceStatusHandler.java
@@ -63,6 +63,8 @@ public class DeviceStatusHandler {
     @Value("${spring.mqtt.latest-ttl-seconds:120}")
     private int latestTtlSeconds;
 
+    private static final String AUTO_MODE = "auto_mode";
+    private static final String AUTO_OFF = "autooff";
     /**
      * 自动关任务管理器，调度/取消自动关任务
      */
@@ -133,6 +135,10 @@ public class DeviceStatusHandler {
                     if (lockHolder != null) {
                         sendObj = new JSONObject(payloadObj);  // 只在需要时复制
                         sendObj.put("clientId", lockHolder);
+                        // 如果相等则为自动模式直接退出方法 不转发ack消息 自动关也不应该转发
+                        if (AUTO_MODE.equals(lockHolder) || AUTO_OFF.equals(lockHolder)) {
+                            return;
+                        }
                     }
                 }
             }