THENG
/
a-tuoheng-device
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xx

This commit is contained in:
孙小云 2026-01-30 14:51:35 +08:00
parent e3f58244be
commit 80f22702b1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/ruoyi/device/controller/DockController.java
View File

@ -62,8 +62,11 @@ public class DockController extends BaseController
@GetMapping("/detail/{dockId}") @GetMapping("/detail/{dockId}")
public R<DockDetailVO> getDockDetail(@PathVariable("dockId") Long dockId) public R<DockDetailVO> getDockDetail(@PathVariable("dockId") Long dockId)
{ {
DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dockId); DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dockId);
if (dockDetailDTO == null) {
return R.fail("机场不存在: dockId=" + dockId);
}
DockDetailVO result = new DockDetailVO(); DockDetailVO result = new DockDetailVO();
BeanUtils.copyProperties(dockDetailDTO, result); BeanUtils.copyProperties(dockDetailDTO, result);
return R.ok(result); return R.ok(result);

4
src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java
View File

@ -196,7 +196,7 @@ public class BufferDeviceImpl implements IBufferDeviceService
.ifPresent(telemetryValue -> { .ifPresent(telemetryValue -> {
var batteryData = telemetryValue.getValue(); var batteryData = telemetryValue.getValue();
if (batteryData != null && !CollectionUtils.isEmpty(batteryData.getBatteries())) { 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(); String batterySn = batteryData.getBatteries().get(0).getSn();
dto.setVoltage(batteryData.getBatteries().get(0).getVoltage()); dto.setVoltage(batteryData.getBatteries().get(0).getVoltage());
dto.setBatteryLevel(batteryData.getBatteries().get(0).getCapacityPercent()); dto.setBatteryLevel(batteryData.getBatteries().get(0).getCapacityPercent());
@ -341,7 +341,7 @@ public class BufferDeviceImpl implements IBufferDeviceService
attributeMap.get(DeviceAttributes.Latitude) attributeMap.get(DeviceAttributes.Latitude)
.ifPresentOrElse( .ifPresentOrElse(
latitude -> { latitude -> {
log.info("获取到纬度数据: {}", latitude); // log.info("获取到纬度数据: {}", latitude);
dto.setLatitude(latitude); dto.setLatitude(latitude);
}, },
() -> log.warn("未获取到纬度数据，dockerDeviceIotId: {}", dockerDeviceIotId) () -> log.warn("未获取到纬度数据，dockerDeviceIotId: {}", dockerDeviceIotId)