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

Merge remote-tracking branch 'origin/master' into dev

Browse Source
This commit is contained in:
墨大叔 2024-08-03 10:30:36 +08:00
commit a72dfb8602
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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