From 80f22702b18536cc2d43b3439937416d93d9d7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 30 Jan 2026 14:51:35 +0800 Subject: [PATCH] xx --- .../java/com/ruoyi/device/controller/DockController.java | 5 ++++- .../java/com/ruoyi/device/service/impl/BufferDeviceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ruoyi/device/controller/DockController.java b/src/main/java/com/ruoyi/device/controller/DockController.java index 2fcccaf..305b0d9 100644 --- a/src/main/java/com/ruoyi/device/controller/DockController.java +++ b/src/main/java/com/ruoyi/device/controller/DockController.java @@ -62,8 +62,11 @@ public class DockController extends BaseController @GetMapping("/detail/{dockId}") public R getDockDetail(@PathVariable("dockId") Long dockId) { - DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dockId); + if (dockDetailDTO == null) { + return R.fail("机场不存在: dockId=" + dockId); + } + DockDetailVO result = new DockDetailVO(); BeanUtils.copyProperties(dockDetailDTO, result); return R.ok(result); diff --git a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java index 10084f4..8dbd163 100644 --- a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java @@ -196,7 +196,7 @@ public class BufferDeviceImpl implements IBufferDeviceService .ifPresent(telemetryValue -> { var batteryData = telemetryValue.getValue(); if (batteryData != null && !CollectionUtils.isEmpty(batteryData.getBatteries())) { - log.info("batteries {}",JSON.toJSONString(batteryData)); +// log.info("batteries {}",JSON.toJSONString(batteryData)); String batterySn = batteryData.getBatteries().get(0).getSn(); dto.setVoltage(batteryData.getBatteries().get(0).getVoltage()); dto.setBatteryLevel(batteryData.getBatteries().get(0).getCapacityPercent()); @@ -341,7 +341,7 @@ public class BufferDeviceImpl implements IBufferDeviceService attributeMap.get(DeviceAttributes.Latitude) .ifPresentOrElse( latitude -> { - log.info("获取到纬度数据: {}", latitude); +// log.info("获取到纬度数据: {}", latitude); dto.setLatitude(latitude); }, () -> log.warn("未获取到纬度数据，dockerDeviceIotId: {}", dockerDeviceIotId)