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