From 6a94e799d676c61e717cb3bab9e79fc0963807ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 30 Jan 2026 15:34:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/device/controller/GroupController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ruoyi/device/controller/GroupController.java b/src/main/java/com/ruoyi/device/controller/GroupController.java index b7a35a4..2753afe 100644 --- a/src/main/java/com/ruoyi/device/controller/GroupController.java +++ b/src/main/java/com/ruoyi/device/controller/GroupController.java @@ -17,9 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; +import java.util.*; /** * 分组Controller @@ -139,10 +137,14 @@ public class GroupController extends BaseController for (Dock dock : allDocks) { if (dock.getLastActiveTime() != null) { DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dock.getDockId()); + dockDetailDTO.setLastActiveTime(dock.getLastActiveTime()); dtoList.add(dockDetailDTO); + } } } + dtoList.sort(Comparator.comparing(DockDetailDTO::getLastActiveTime).reversed()); + return R.ok(DockWithGPSVOConvert.fromList(dtoList)); }else { List groupDTOS = groupService.getDocksByGroupId(groupId);