diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java index 2600d740..454a47cd 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java @@ -484,21 +484,28 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService { List> list = new ArrayList<>(); for (String stationName : stationSet) { Map map = new HashMap<>(); + Long allNum = 0L; map.put("stationName",stationName); if (closeStation.containsKey(stationName)){ map.put("close",closeStation.get(stationName)); + allNum += closeStation.get(stationName); } else { map.put("close",0); } if (restrictionStation.containsKey(stationName)){ map.put("restriction",restrictionStation.get(stationName)); + allNum += restrictionStation.get(stationName); } else { map.put("restriction",0); } + + map.put("allNum",allNum); list.add(map); } + //根据总数排序 + list = list.stream().sorted(Comparator.comparing(item -> Long.parseLong(((Map) item).get("allNum").toString())).reversed()).collect(Collectors.toList()); return AjaxResult.success(list); }