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); } }