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 a033cee..a2aba69 100644 --- a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java @@ -125,6 +125,8 @@ public class BufferDeviceImpl implements IBufferDeviceService */ dto.setMissionCount(aircraftDetailDTO.getMissionCount()); + + } @@ -566,11 +568,24 @@ public class BufferDeviceImpl implements IBufferDeviceService } } - // 获取无人机是否在舱内: {"0":"舱外","1":"舱内"} - Integer droneInDock = telemetryMap.get(DeviceTelemetry.Drone_In_Dock) + // {"0":"关闭","1":"打开","2":"半开","3":"舱盖状态异常"} + Integer cover_state = telemetryMap.get(DeviceTelemetry.Cover_State) .map(telemetryValue -> telemetryValue.getValue()) .orElse(null); + Integer droneInDock = 1; + + if (cover_state != null && cover_state == 0) { + droneInDock = 1; + }else { + droneInDock = 0; + } + +// // 获取无人机是否在舱内: {"0":"舱外","1":"舱内"} +// Integer droneInDock = telemetryMap.get(DeviceTelemetry.Drone_In_Dock) +// .map(telemetryValue -> telemetryValue.getValue()) +// .orElse(null); + // 从 telemetryAirportMap 中取 total_flight_time, 如果时间是在一分钟以内更新的,则为开机,否则为关机 // 获取无人机是否开机: {"0":"关机","1":"开机"}