THENG
/
a-tuoheng-device
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加排序

This commit is contained in:
孙小云 2026-01-30 15:34:59 +08:00
parent 4e81906fc0
commit 6a94e799d6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/ruoyi/device/controller/GroupController.java
View File

@ -17,9 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Objects;
/** /**
* 分组Controller * 分组Controller
@ -139,10 +137,14 @@ public class GroupController extends BaseController
for (Dock dock : allDocks) { for (Dock dock : allDocks) {
if (dock.getLastActiveTime() != null) { if (dock.getLastActiveTime() != null) {
DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dock.getDockId()); DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dock.getDockId());
dockDetailDTO.setLastActiveTime(dock.getLastActiveTime());
dtoList.add(dockDetailDTO); dtoList.add(dockDetailDTO);
} }
} }
} }
dtoList.sort(Comparator.comparing(DockDetailDTO::getLastActiveTime).reversed());
return R.ok(DockWithGPSVOConvert.fromList(dtoList)); return R.ok(DockWithGPSVOConvert.fromList(dtoList));
}else { }else {
List<DockGroupDTO> groupDTOS = groupService.getDocksByGroupId(groupId); List<DockGroupDTO> groupDTOS = groupService.getDocksByGroupId(groupId);