|
|
@ -317,7 +317,7 @@ public class BigScreenController extends BaseController {
|
|
|
|
alarmVos.add(metaAlarmInfoAndHandleAlarmVo);
|
|
|
|
alarmVos.add(metaAlarmInfoAndHandleAlarmVo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<MetaAlarmInfoAndHandleAlarmVo> sortedList = alarmVos.stream()
|
|
|
|
List<MetaAlarmInfoAndHandleAlarmVo> sortedList = alarmVos.stream()
|
|
|
|
.sorted(Comparator.comparing(MetaAlarmInfoAndHandleAlarmVo::getJjxxInformantTime))
|
|
|
|
.sorted(Comparator.comparing(MetaAlarmInfoAndHandleAlarmVo::getJjxxAlarmResponseTime).reversed())
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
return AjaxResult.success(sortedList);
|
|
|
|
return AjaxResult.success(sortedList);
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
|