From 23313ec463e139fb76f5e3d1011630ab8501cb4b 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: Wed, 16 Oct 2024 23:04:45 +0800
Subject: [PATCH] =?UTF-8?q?debug:=E5=BD=92=E9=9B=B6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=EF=BC=88=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=9B=A0=E4=B8=BA=E6=98=AF=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ss/device/service/impl/DeviceServiceImpl.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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 f922f005..81646080 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
@@ -518,8 +518,14 @@ public class DeviceServiceImpl implements DeviceService
     }
 
     private void resetRecord(DeviceVO device, RecordTimeType type, String reason) {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
+        LoginUser loginUser;
+        try {
+            loginUser = SecurityUtils.getLoginUser();
+        } catch (Exception e) {
+            loginUser = null;
+        }
 
+        LoginUser finalLoginUser = loginUser;
         scheduledExecutorService.schedule(() -> {
             RecordTime record = null;
             // 电量
@@ -529,7 +535,7 @@ public class DeviceServiceImpl implements DeviceService
                         device,
                         amount,
                         reason,
-                        loginUser,
+                        finalLoginUser,
                         RecordTimeType.ELE.getType()
                 );
             }
@@ -537,7 +543,7 @@ public class DeviceServiceImpl implements DeviceService
             else if (RecordTimeType.TIME.equals(type)) {
                 Duration duration = Duration.between(LocalDateTime.now(), device.getExpireTime());
                 long seconds = duration.getSeconds() > 0 ? duration.getSeconds() : 0;
-                record = recordTimeConverter.toRecordTime(device, -seconds, "设备归零", loginUser, RecordTimeType.TIME.getType());
+                record = recordTimeConverter.toRecordTime(device, -seconds, "设备归零", finalLoginUser, RecordTimeType.TIME.getType());
             }
             if (record != null) {
                 recordTimeService.insertRecordTime(record);