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