From ff22ce08caf91cd0a0f9b053005183efd403dd64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Wed, 4 Feb 2026 16:52:21 +0800
Subject: [PATCH] xx

---
 .../device/controller/StaticsController.java  | 22 ++++++++++++-------
 1 file changed, 14 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 1592681..88d70c6 100644
--- a/src/main/java/com/ruoyi/device/controller/StaticsController.java
+++ b/src/main/java/com/ruoyi/device/controller/StaticsController.java
@@ -127,13 +127,16 @@ public class StaticsController extends BaseController
         StatisticsVO vo = new StatisticsVO();
 
         // 获取所有机场
-        List<DockDTO> docks = dockService.selectDockList(new DockDTO());
-        vo.setDockCount(docks != null ? docks.size() : 0);
-        log.info("机场总数: {}", vo.getDockCount());
+        List<DockDTO> allDocks = dockService.selectDockList(new DockDTO());
+
+        // 过滤出大疆机场
+        List<DockDTO> docks = filterDocksByManufacturer(allDocks, "dajiang");
+        vo.setDockCount(docks.size());
+        log.info("大疆机场总数: {}", vo.getDockCount());
 
         // 批量获取机场详情 - 优化：从N次查询减少到1次批量查询
         Map<Long, DockDetailDTO> dockDetailsMap = null;
-        if (docks != null && !docks.isEmpty()) {
+        if (!docks.isEmpty()) {
             List<Long> dockIds = docks.stream()
                     .map(DockDTO::getDockId)
                     .collect(Collectors.toList());
@@ -178,13 +181,16 @@ public class StaticsController extends BaseController
         log.info("机场状态统计结果 -> 空闲:{}, 任务中:{}, 调试:{}, 离线:{}", idleCount, workingCount, debuggingCount, offlineCount);
 
         // 获取所有无人机
-        List<AircraftDTO> aircrafts = aircraftService.selectAircraftList(new AircraftDTO());
-        vo.setAircraftCount(aircrafts != null ? aircrafts.size() : 0);
-        log.info("无人机总数: {}", vo.getAircraftCount());
+        List<AircraftDTO> allAircrafts = aircraftService.selectAircraftList(new AircraftDTO());
+
+        // 过滤出大疆无人机
+        List<AircraftDTO> aircrafts = filterAircraftsByManufacturer(allAircrafts, "dajiang");
+        vo.setAircraftCount(aircrafts.size());
+        log.info("大疆无人机总数: {}", vo.getAircraftCount());
 
         // 批量获取无人机详情 - 优化：从N次查询减少到1次批量查询
         Map<Long, AircraftDetailDTO> aircraftDetailsMap = null;
-        if (aircrafts != null && !aircrafts.isEmpty()) {
+        if (!aircrafts.isEmpty()) {
             List<Long> aircraftIds = aircrafts.stream()
                     .map(AircraftDTO::getAircraftId)
                     .collect(Collectors.toList());