Commit 437fc800 authored by 高建强's avatar 高建强

item:直流中心bug修改

parent b60297c8
...@@ -2115,13 +2115,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -2115,13 +2115,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
List<Long> idList = records.stream().map(FireFightingSystemDto::getId).collect(Collectors.toList()); List<Long> idList = records.stream().map(FireFightingSystemDto::getId).collect(Collectors.toList());
List<FireFightingSystemDto> list = equipmentSpecificSerivce.fireSysIotEquipAlarmCount(new Date(), bizOrgCode); List<FireFightingSystemDto> list = equipmentSpecificSerivce.fireSysIotEquipAlarmCount(new Date(), bizOrgCode);
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
//使用stream流把list1和list2根据属性userId合并一个list集合 //使用stream流把list1和list2根据属性userId合并一个list集合,并根据状态倒序、系统排序升序
List<FireFightingSystemDto> collect = records.stream().peek(m -> list.stream().filter(m2 -> Objects.equals(m.getId(), m2.getId())).forEach(m2 -> { List<FireFightingSystemDto> collect = records.stream().peek(m -> list.stream().filter(m2 -> Objects.equals(m.getId(), m2.getId())).forEach(m2 -> {
m.setAlarmEquipTotal(m2.getAlarmEquipTotal()); m.setAlarmEquipTotal(m2.getAlarmEquipTotal());
m.setStatus(m2.getStatus()); m.setStatus(m2.getStatus());
})).sorted(Comparator.comparing(FireFightingSystemDto::getStatus, Comparator.reverseOrder()) })).sorted(Comparator.comparing(FireFightingSystemDto::getStatus, Comparator.reverseOrder())
.thenComparing(FireFightingSystemDto::getSort)).collect(Collectors.toList()); .thenComparing(FireFightingSystemDto::getSort)).collect(Collectors.toList());
// 根据状态倒序排序
pages.setRecords(collect); pages.setRecords(collect);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment