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

xx

This commit is contained in:
孙小云 2026-02-04 16:52:21 +08:00
parent bad9e733bc
commit ff22ce08ca
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/ruoyi/device/controller/StaticsController.java
View File

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