From a2086e0ab1d6ddbe30d23fd2b2a18e5966e85bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Sat, 3 Aug 2024 10:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E9=9B=B6=E9=80=BB=E8=BE=91=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=EF=BC=8C=E6=97=B6=E9=95=BF=E6=94=B9=E4=B8=BA1?=
 =?UTF-8?q?=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/ss/device/service/impl/DeviceServiceImpl.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 64056d4a..a5f0dc25 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
@@ -697,18 +697,16 @@ public class DeviceServiceImpl implements DeviceService
         transactionBillService.batchEndBillByDevice(deviceId);
 
         // 物联网设备归零
-        CommandResponse commandResponse = iotService.setTime(device.getMac(), 0L);
+        CommandResponse commandResponse = iotService.setTime(device.getMac(), 1L);
         ServiceUtil.assertion(!commandResponse.isSuccess(), "设备归零失败，请检查设备是否在线或联系管理员");
 
-        // 强制关闭
-        iotService.close(device.getMac());
-
         // 归零记录
         LoginUser loginUser = SecurityUtils.getLoginUser();
         scheduledExecutorService.schedule(() -> {
             // 设备剩余时长
             Duration duration = Duration.between(now, device.getExpireTime());
-            recordTimeService.insertRecordTime(recordTimeConverter.toRecordTime(device, -duration.getSeconds(), "设备归零", loginUser));
+            long seconds = duration.getSeconds() > 0 ? duration.getSeconds() : 0;
+            recordTimeService.insertRecordTime(recordTimeConverter.toRecordTime(device, -seconds, "设备归零", loginUser));
         }, 0, TimeUnit.SECONDS);
 
         return true;