From 8b746cca1c79f93f14cfe83a3e7f9ca7d90dc692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Fri, 20 Sep 2024 18:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=B7=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 e354d483..40e9b2e5 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
@@ -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) {