From d70132180bcbe75c430a2970e5b13cd1321b5039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Thu, 22 Jan 2026 20:04:09 +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

---
 .../device/controller/GroupController.java    | 11 ++--
 .../convert/DockWithGPSVOConvert.java         | 52 +++++++++++++++++++
 2 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/ruoyi/device/controller/convert/DockWithGPSVOConvert.java

diff --git a/src/main/java/com/ruoyi/device/controller/GroupController.java b/src/main/java/com/ruoyi/device/controller/GroupController.java
index fb0801b..4fd877f 100644
--- a/src/main/java/com/ruoyi/device/controller/GroupController.java
+++ b/src/main/java/com/ruoyi/device/controller/GroupController.java
@@ -2,12 +2,9 @@ package com.ruoyi.device.controller;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.device.api.domain.DockVO;
-import com.ruoyi.device.api.domain.GroupCreateRequest;
-import com.ruoyi.device.api.domain.GroupUpdateRequest;
-import com.ruoyi.device.api.domain.GroupVO;
-import com.ruoyi.device.api.domain.SwitchDockGroupRequest;
+import com.ruoyi.device.api.domain.*;
 import com.ruoyi.device.controller.convert.DockVOConvert;
+import com.ruoyi.device.controller.convert.DockWithGPSVOConvert;
 import com.ruoyi.device.controller.convert.GroupVOConvert;
 import com.ruoyi.device.service.api.IBufferDeviceService;
 import com.ruoyi.device.service.api.IGroupService;
@@ -102,7 +99,7 @@ public class GroupController extends BaseController
      */
     //@InnerAuth
     @GetMapping("/docks/{groupId}")
-    public R<List<DockVO>> getDocksByGroupId(@PathVariable("groupId") Long groupId)
+    public R<List<DockWithGPSVO>> getDocksByGroupId(@PathVariable("groupId") Long groupId)
     {
         logger.info("getDocksByGroupId {}", groupId);
         List<DockGroupDTO> groupDTOS = groupService.getDocksByGroupId(groupId);
@@ -112,7 +109,7 @@ public class GroupController extends BaseController
             dtoList.add(dockDetailDTO);
         }
 
-        return R.ok(DockVOConvert.fromDockDetailDTOList(dtoList));
+        return R.ok(DockWithGPSVOConvert.fromList(dtoList));
     }
 
     /**
diff --git a/src/main/java/com/ruoyi/device/controller/convert/DockWithGPSVOConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DockWithGPSVOConvert.java
new file mode 100644
index 0000000..62a1709
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/controller/convert/DockWithGPSVOConvert.java
@@ -0,0 +1,52 @@
+package com.ruoyi.device.controller.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.api.domain.DockVO;
+import com.ruoyi.device.api.domain.DockWithGPSVO;
+import com.ruoyi.device.service.dto.DockDTO;
+import com.ruoyi.device.service.dto.DockDetailDTO;
+import org.springframework.beans.BeanUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class DockWithGPSVOConvert extends BaseConvert<DockDetailDTO, DockWithGPSVO>
+{
+
+    private static final DockWithGPSVOConvert INSTANCE = new DockWithGPSVOConvert();
+
+    private DockWithGPSVOConvert() {
+        super(DockDetailDTO.class, DockWithGPSVO.class);
+    }
+
+    /**
+     * DTO 转 VO
+     */
+    public static DockWithGPSVO from(DockDetailDTO dto)
+    {
+        return INSTANCE.innerFrom(dto);
+    }
+
+    /**
+     * VO 转 DTO
+     */
+    public static DockDetailDTO to(DockWithGPSVO vo)
+    {
+        return INSTANCE.innerTo(vo);
+    }
+
+
+     public static List<DockWithGPSVO> fromList(List<DockDetailDTO> dtoList)
+     {
+         return INSTANCE.innerFromList(dtoList);
+     }
+
+
+     /**
+     * VO List 转 DTO List
+     */
+    public static List<DockDetailDTO> toList(List<DockWithGPSVO> voList)
+    {
+        return INSTANCE.innerToList(voList);
+    }
+}
\ No newline at end of file