From 23a9df7750f1d60e00f1bd05f8635bb41805fa19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Fri, 13 Mar 2026 09:38:00 +0800
Subject: [PATCH] xx

---
 .../device/controller/AircraftController.java | 19 +++++++++++++++++++
 .../device/mapper/DockAircraftMapper.java     |  8 ++++++++
 .../mapper/device/DockAircraftMapper.xml      | 17 +++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/src/main/java/com/ruoyi/device/controller/AircraftController.java b/src/main/java/com/ruoyi/device/controller/AircraftController.java
index e96e4b1..b6870fd 100644
--- a/src/main/java/com/ruoyi/device/controller/AircraftController.java
+++ b/src/main/java/com/ruoyi/device/controller/AircraftController.java
@@ -5,7 +5,9 @@ import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.security.annotation.InnerAuth;
 import com.ruoyi.device.api.domain.AircraftDetailVO;
 import com.ruoyi.device.api.domain.AircraftUpdateRequest;
+import com.ruoyi.device.api.domain.DockAircraftVO;
 import com.ruoyi.device.controller.convert.AircraftDetailVOConvert;
+import com.ruoyi.device.mapper.DockAircraftMapper;
 import com.ruoyi.device.service.api.IAircraftService;
 import com.ruoyi.device.service.impl.DefaultBufferDeviceImpl;
 import com.ruoyi.device.service.dto.AircraftDetailDTO;
@@ -13,6 +15,8 @@ import com.ruoyi.device.service.dto.AircraftDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 无人机Controller
  *
@@ -29,6 +33,9 @@ public class AircraftController extends BaseController
     @Autowired
     private DefaultBufferDeviceImpl bufferDeviceService;
 
+    @Autowired
+    private DockAircraftMapper dockAircraftMapper;
+
     /**
      * 查看无人机详情
      *
@@ -60,4 +67,16 @@ public class AircraftController extends BaseController
         aircraftService.updateAircraft(dto);
         return R.ok();
     }
+
+    /**
+     * 获取所有机场和机场的无人机
+     *
+     * @return 机场无人机列表
+     */
+    @GetMapping("/dock-aircraft-list")
+    public R<List<DockAircraftVO>> getDockAircraftList()
+    {
+        List<DockAircraftVO> list = dockAircraftMapper.selectDockAircraftWithDetails();
+        return R.ok(list);
+    }
 }
diff --git a/src/main/java/com/ruoyi/device/mapper/DockAircraftMapper.java b/src/main/java/com/ruoyi/device/mapper/DockAircraftMapper.java
index 10190c2..2fac188 100644
--- a/src/main/java/com/ruoyi/device/mapper/DockAircraftMapper.java
+++ b/src/main/java/com/ruoyi/device/mapper/DockAircraftMapper.java
@@ -1,5 +1,6 @@
 package com.ruoyi.device.mapper;
 
+import com.ruoyi.device.api.domain.DockAircraftVO;
 import com.ruoyi.device.mapper.entity.DockAircraftEntity;
 import java.util.List;
 
@@ -74,4 +75,11 @@ public interface DockAircraftMapper
      * @return 影响行数
      */
     int deleteDockAircraftByIds(Long[] ids);
+
+    /**
+     * 查询所有机场和机场的无人机
+     *
+     * @return 机场无人机列表
+     */
+    List<DockAircraftVO> selectDockAircraftWithDetails();
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/device/DockAircraftMapper.xml b/src/main/resources/mapper/device/DockAircraftMapper.xml
index 00b2d47..74a5148 100644
--- a/src/main/resources/mapper/device/DockAircraftMapper.xml
+++ b/src/main/resources/mapper/device/DockAircraftMapper.xml
@@ -89,4 +89,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <resultMap type="com.ruoyi.device.api.domain.DockAircraftVO" id="DockAircraftVOResult">
+        <result property="deviceSn"       column="device_sn"      />
+        <result property="aircraftName"   column="aircraft_name"  />
+        <result property="dockName"       column="dock_name"      />
+    </resultMap>
+
+    <select id="selectDockAircraftWithDetails" resultMap="DockAircraftVOResult">
+        select
+            d.device_sn,
+            a.aircraft_name,
+            dk.dock_name
+        from device_dock_aircraft da
+        left join device_aircraft a on da.aircraft_id = a.aircraft_id
+        left join device_device d on a.device_id = d.device_id
+        left join device_dock dk on da.dock_id = dk.dock_id
+    </select>
+
 </mapper>
\ No newline at end of file