|
|
@ -293,7 +293,6 @@ public class BigScreenController extends BaseController {
|
|
|
|
@ApiOperation("警情统计列表,重点警情")
|
|
|
|
@ApiOperation("警情统计列表,重点警情")
|
|
|
|
public AjaxResult policeSituationStatisticsList() {
|
|
|
|
public AjaxResult policeSituationStatisticsList() {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
|
|
|
|
List<MetaAlarmInfoAndHandleAlarmVo> metaAlarmInfos = alarmInfoService.listAlarmAndHandleAlarm();
|
|
|
|
List<MetaAlarmInfoAndHandleAlarmVo> metaAlarmInfos = alarmInfoService.listAlarmAndHandleAlarm();
|
|
|
|
ArrayList<MetaAlarmInfoAndHandleAlarmVo> alarmVos = new ArrayList<>();
|
|
|
|
ArrayList<MetaAlarmInfoAndHandleAlarmVo> alarmVos = new ArrayList<>();
|
|
|
|
for (MetaAlarmInfoAndHandleAlarmVo metaAlarmInfoAndHandleAlarmVo : metaAlarmInfos){
|
|
|
|
for (MetaAlarmInfoAndHandleAlarmVo metaAlarmInfoAndHandleAlarmVo : metaAlarmInfos){
|
|
|
@ -315,6 +314,7 @@ public class BigScreenController extends BaseController {
|
|
|
|
metaAlarmInfoAndHandleAlarmVo.setJjxxAlarmResponseTime(dateFormat.format(jjxxAlarmResponse));
|
|
|
|
metaAlarmInfoAndHandleAlarmVo.setJjxxAlarmResponseTime(dateFormat.format(jjxxAlarmResponse));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
alarmVos.add(metaAlarmInfoAndHandleAlarmVo);
|
|
|
|
alarmVos.add(metaAlarmInfoAndHandleAlarmVo);
|
|
|
|
|
|
|
|
Collections.sort(alarmVos,Collections.reverseOrder());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return AjaxResult.success(alarmVos);
|
|
|
|
return AjaxResult.success(alarmVos);
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
|