From 749b8e87dddcefea1da27782171b8d6d73a245cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Wed, 21 Jan 2026 14:04:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9convert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/device/controller/GroupController.java | 8 +++++---
 .../java/com/ruoyi/device/service/api/IGroupService.java  | 2 +-
 .../com/ruoyi/device/service/impl/GroupServiceImpl.java   | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/controller/GroupController.java b/src/main/java/com/ruoyi/device/controller/GroupController.java
index 4ab3f5a..6f148c0 100644
--- a/src/main/java/com/ruoyi/device/controller/GroupController.java
+++ b/src/main/java/com/ruoyi/device/controller/GroupController.java
@@ -4,8 +4,10 @@ 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.GroupVO;
 import com.ruoyi.device.api.domain.SwitchDockGroupRequest;
 import com.ruoyi.device.controller.convert.DockVOConvert;
+import com.ruoyi.device.controller.convert.GroupVOConvert;
 import com.ruoyi.device.service.api.IBufferDeviceService;
 import com.ruoyi.device.service.api.IGroupService;
 import com.ruoyi.device.service.dto.DockDetailDTO;
@@ -101,9 +103,9 @@ public class GroupController extends BaseController
      */
     //@InnerAuth
     @GetMapping("/list")
-    public R<List<Long>> getAllGroupIds()
+    public R<List<GroupVO>> getAllGroupIds()
     {
-        List<Long> groupIds = groupService.getAllGroupIds();
-        return R.ok(groupIds);
+        List<GroupDTO> groupIds = groupService.getAllGroupIds();
+        return R.ok(GroupVOConvert.fromList(groupIds));
     }
 }
diff --git a/src/main/java/com/ruoyi/device/service/api/IGroupService.java b/src/main/java/com/ruoyi/device/service/api/IGroupService.java
index a9745bc..efa2668 100644
--- a/src/main/java/com/ruoyi/device/service/api/IGroupService.java
+++ b/src/main/java/com/ruoyi/device/service/api/IGroupService.java
@@ -98,5 +98,5 @@ public interface IGroupService
      *
      * @return 分组ID列表
      */
-    List<Long> getAllGroupIds();
+    List<GroupDTO> getAllGroupIds();
 }
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java
index d3bec71..fb55920 100644
--- a/src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java
@@ -128,9 +128,9 @@ public class GroupServiceImpl implements IGroupService
     }
 
     @Override
-    public List<Long> getAllGroupIds()
+    public List<GroupDTO> getAllGroupIds()
     {
         List<Group> groupList = groupDomain.selectGroupList(new Group());
-        return groupList.stream().map(Group::getGroupId).toList();
+        return GroupDTOConvert.fromList(groupList);
     }
 }
\ No newline at end of file