From 3933ea2ed3dab49fe6c976f80f4a43bacaf14282 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 09:29:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E9=87=8C=E9=9D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/device/controller/GroupController.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ruoyi/device/controller/GroupController.java b/src/main/java/com/ruoyi/device/controller/GroupController.java index b7b431b..d2abc17 100644 --- a/src/main/java/com/ruoyi/device/controller/GroupController.java +++ b/src/main/java/com/ruoyi/device/controller/GroupController.java @@ -106,7 +106,18 @@ public class GroupController extends BaseController @GetMapping("/list") public R> getAllGroupIds() { - List groupIds = groupService.getAllGroupIds(); - return R.ok(GroupVOConvert.fromList(groupIds)); + List groupDTOs = groupService.getAllGroupIds(); + // Calculate aircraft count for each group + + List groupVOS = new ArrayList<>(); + + for(GroupDTO groupDTO : groupDTOs){ + GroupVO groupVO = GroupVOConvert.from(groupDTO); + List dockGroupDTOs = groupService.getDocksByGroupId(groupDTO.getGroupId()); + groupVO.setDockCount(dockGroupDTOs.size()); + groupVOS.add(groupVO); + } + + return R.ok(groupVOS); } }