Merge remote-tracking branch 'origin/master'

# Conflicts:
#	viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/rule/clean/processor/BeaconDetectionRuleProcessor.java

viewsh-module-iot/viewsh-module-iot-server/src/main/java/com/viewsh/module/iot/service/rule/clean/processor/BeaconDetectionRuleProcessor.java

@@ -179,8 +179,8 @@ public class BeaconDetectionRuleProcessor {
         log.info("[BeaconDetection] 离开确认：deviceId={}, areaId={}, window={}",
                 deviceId, areaId, window);
 
-        // 清除本地到岗状态，恢复OUT_AREA
-        arrivedTimeRedisDAO.clearArrivedTime(deviceId, areaId);
+        // 注意：离岗警告阶段不清除arrivedTime，保持IN_AREA状态
+        // arrivedTime在工单完成时由SignalLossRuleProcessor.cleanupRedisData清除
 
         // P0 插队校验：检查当前工单是否属于正在检查的区域
         if (isSwitchingOrder(deviceId, areaId)) {