From 6bcda98673b350a03b23b476a23d32b7774fa8a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Fri, 3 Jan 2025 15:42:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
index 91ea0201..ffd09560 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
@@ -1355,7 +1355,8 @@ public class DeviceServiceImpl implements DeviceService
                     boolean hasTime = device.getSurplusSecondsDb() > 0;         // 剩余时间
                     boolean hasOpenAfterExpireEle = hasOpen && lastOperaEle != null && lastOperaEle.compareTo(device.getExpireEle()) > 0;   // 是否在结束电量后开启
                     boolean hasEle = device.getSurplusEleDb().compareTo(BigDecimal.ZERO) > 0;   // 剩余电量
-                    if (!hasTime && !hasEle && !hasOpenAfterExpireTime && !hasOpenAfterExpireEle) {
+                    boolean isClose = DevicePowerStatus.OFF.getStatus().equals(device.getPowerStatus());   // 是否关闭
+                    if (!hasTime && !hasEle && !hasOpenAfterExpireTime && !hasOpenAfterExpireEle && !isClose) {
                         this.switchDevice(device, DevicePowerStatus.OFF, "设备监控-发现异常未关闭设备");
                     }
                 },0, TimeUnit.SECONDS);