chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备刷新bug

Browse Source
This commit is contained in:
墨大叔 2024-09-20 18:54:42 +08:00
parent 49c1b8b57b
commit 8b746cca1c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
View File

@ -752,9 +752,9 @@ public class DeviceServiceImpl implements DeviceService
// 判断设备是否正在使用
// 设备过期时间 > 当前时间，则正在使用
boolean hasTime = device.getExpireTime().isAfter(now);
boolean hasTime = device.getExpireTime() != null && device.getExpireTime().isAfter(now);
// 若当前设备有电量，则正在使用
boolean hasEle = data.getSurplusEle().compareTo(BigDecimal.ZERO) > 0;
boolean hasEle = data.getSurplusEle() != null && data.getSurplusEle().compareTo(BigDecimal.ZERO) > 0;
// 若开关开启，则正在使用
boolean hasOpen = DevicePowerStatus.ON.getStatus().equals(data.getPowerStatus());
if (hasTime || hasEle || hasOpen) {