From e097e597f5c5b4cfc35dce52427c1de8b1f7f1b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Wed, 21 Jan 2026 17:14:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=BA=E5=9C=BA=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=9F=A5=E7=9C=8B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/device/controller/AircraftController.java | 2 +- .../com/ruoyi/device/controller/DockController.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/device/controller/AircraftController.java b/src/main/java/com/ruoyi/device/controller/AircraftController.java index 156aff0..008894f 100644 --- a/src/main/java/com/ruoyi/device/controller/AircraftController.java +++ b/src/main/java/com/ruoyi/device/controller/AircraftController.java @@ -33,7 +33,7 @@ public class AircraftController extends BaseController * @param aircraftId 无人机ID * @return 无人机详情 */ - @InnerAuth + // @InnerAuth @GetMapping("/detail/{aircraftId}") public R getAircraftDetail(@PathVariable("aircraftId") Long aircraftId) { diff --git a/src/main/java/com/ruoyi/device/controller/DockController.java b/src/main/java/com/ruoyi/device/controller/DockController.java index ec390d0..de16964 100644 --- a/src/main/java/com/ruoyi/device/controller/DockController.java +++ b/src/main/java/com/ruoyi/device/controller/DockController.java @@ -10,6 +10,7 @@ import com.ruoyi.device.service.api.IBufferDeviceService; import com.ruoyi.device.service.dto.DockDetailDTO; import com.ruoyi.device.service.dto.DockDTO; import com.ruoyi.device.controller.convert.DockVOConvert; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -38,7 +39,7 @@ public class DockController extends BaseController * @param dockId 机场ID * @return 机场列表 */ - @InnerAuth + //@InnerAuth @GetMapping("/search") public R> searchDocks(@RequestParam(required = false) String dockStatus, @RequestParam(required = false) Long dockId) { @@ -53,11 +54,14 @@ public class DockController extends BaseController * @param dockId 机场ID * @return 机场详情 */ - @InnerAuth + //@InnerAuth @GetMapping("/detail/{dockId}") public R getDockDetail(@PathVariable("dockId") Long dockId) { - return R.ok(null); + DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dockId); + DockDetailVO result = new DockDetailVO(); + BeanUtils.copyProperties(dockDetailDTO, result); + return R.ok(result); } }