From 31454217ea9b6e7f31cd83584244dbfffac0b067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 22 Jan 2026 20:05:40 +0800 Subject: [PATCH] =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0group/docks/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/device/controller/DockController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ruoyi/device/controller/DockController.java b/src/main/java/com/ruoyi/device/controller/DockController.java index 6bd487f..2fcccaf 100644 --- a/src/main/java/com/ruoyi/device/controller/DockController.java +++ b/src/main/java/com/ruoyi/device/controller/DockController.java @@ -6,6 +6,8 @@ import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.device.api.domain.DockDetailVO; import com.ruoyi.device.api.domain.DockUpdateRequest; import com.ruoyi.device.api.domain.DockVO; +import com.ruoyi.device.api.domain.DockWithGPSVO; +import com.ruoyi.device.controller.convert.DockWithGPSVOConvert; import com.ruoyi.device.service.api.IDockService; import com.ruoyi.device.service.api.IBufferDeviceService; import com.ruoyi.device.service.dto.DockDetailDTO; @@ -92,7 +94,7 @@ public class DockController extends BaseController */ //@InnerAuth @GetMapping("/list") - public R> getAllDocks() + public R> getAllDocks() { List dockDTOs = dockService.selectDockList(new DockDTO()); List dtoList = new ArrayList<>(); @@ -100,6 +102,6 @@ public class DockController extends BaseController DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dockDTO.getDockId()); dtoList.add(dockDetailDTO); } - return R.ok(DockVOConvert.fromDockDetailDTOList(dtoList)); + return R.ok(DockWithGPSVOConvert.fromList(dtoList)); } }