From 8328978768a7265b44fa5b28c031b613078102ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 6 Feb 2026 11:27:52 +0800 Subject: [PATCH] xx --- .../device/controller/StaticsController.java | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ruoyi/device/controller/StaticsController.java b/src/main/java/com/ruoyi/device/controller/StaticsController.java index 157a037..c4148cb 100644 --- a/src/main/java/com/ruoyi/device/controller/StaticsController.java +++ b/src/main/java/com/ruoyi/device/controller/StaticsController.java @@ -205,31 +205,42 @@ public class StaticsController extends BaseController int offlineAircraftCount = 0; if (aircrafts != null && aircraftDetailsMap != null) { - log.info("---------- 开始统计无人机状态 ----------"); + log.info("---------- 开始统计大疆无人机状态 ----------"); for (AircraftDTO aircraft : aircrafts) { AircraftDetailDTO aircraftDetail = aircraftDetailsMap.get(aircraft.getAircraftId()); if (aircraftDetail != null && aircraftDetail.getAircraftStatus() != null) { String status = aircraftDetail.getAircraftStatus(); - log.info("无人机[ID:{}, Name:{}] 状态: {}", aircraft.getAircraftId(), aircraft.getAircraftName(), status); + log.info("大疆无人机[ID:{}, Name:{}] 状态: {}", aircraft.getAircraftId(), aircraft.getAircraftName(), status); if (AircraftStatusEnum.POWER_ON_IN_CABIN.getCode().equalsIgnoreCase(status)) { powerOnInCabinCount++; - log.debug(" -> 匹配到舱内开机状态"); + log.info(" -> 匹配到舱内开机状态"); } else if (AircraftStatusEnum.POWER_OFF_IN_CABIN.getCode().equalsIgnoreCase(status)) { powerOffInCabinCount++; - log.debug(" -> 匹配到舱内关机状态"); + log.info(" -> 匹配到舱内关机状态"); + } else if (AircraftStatusEnum.POWER_ON_OUT_CABIN.getCode().equalsIgnoreCase(status)) { + // 舱外开机归类到舱内开机 + powerOnInCabinCount++; + log.info(" -> 匹配到舱外开机状态，归类到舱内开机"); + } else if (AircraftStatusEnum.POWER_OFF_OUT_CABIN.getCode().equalsIgnoreCase(status)) { + // 舱外关机归类到舱内关机 + powerOffInCabinCount++; + log.info(" -> 匹配到舱外关机状态，归类到舱内关机"); } else if (AircraftStatusEnum.IN_MISSION.getCode().equalsIgnoreCase(status)) { inMissionCount++; log.info(" -> 匹配到IN_MISSION状态 (任务中)"); } else if (AircraftStatusEnum.DEBUGGING.getCode().equalsIgnoreCase(status)) { debuggingAircraftCount++; - log.debug(" -> 匹配到调试状态"); + log.info(" -> 匹配到调试状态"); } else if (AircraftStatusEnum.OFFLINE.getCode().equalsIgnoreCase(status)) { offlineAircraftCount++; - log.debug(" -> 匹配到离线状态"); - } else { + log.info(" -> 匹配到离线状态"); + } else { offlineAircraftCount++; - log.debug(" -> 其他状态，归类为离线"); + log.info(" -> 未知状态[{}]，归类为离线", status); } + } else { + log.warn("大疆无人机[ID:{}, Name:{}] 无法获取详情或状态为空", + aircraft.getAircraftId(), aircraft.getAircraftName()); } } } @@ -374,6 +385,9 @@ public class StaticsController extends BaseController offlineAircraftCount++; log.info(" -> 未知状态[{}]，归类为离线", status); } + } else { + log.warn("拓恒无人机[ID:{}, Name:{}] 无法获取详情或状态为空", + aircraft.getAircraftId(), aircraft.getAircraftName()); } } }