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);