|
|
@ -279,7 +279,7 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno |
|
|
|
}).sorted(Comparator.comparing(AlarmDataVo::getIsHandle) |
|
|
|
}).sorted(Comparator.comparing(AlarmDataVo::getIsHandle) |
|
|
|
.thenComparing(AlarmDataVo::getTs, Comparator.reverseOrder())).collect(Collectors.toList()); |
|
|
|
.thenComparing(AlarmDataVo::getTs, Comparator.reverseOrder())).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
|
|
response.setCount((int) datas.stream().filter(data-> !data.getIsBinding()).count()); |
|
|
|
response.setCount((int) datas.stream().filter(data-> !data.getIsHandle()).count()); |
|
|
|
response.setSoeList(datas); |
|
|
|
response.setSoeList(datas); |
|
|
|
response.setTotal(result.getData().getTotal()); |
|
|
|
response.setTotal(result.getData().getTotal()); |
|
|
|
return response; |
|
|
|
return response; |
|
|
|