|
@@ -236,13 +236,13 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
|
|
|
|
|
|
@Override
|
|
|
public AjaxResult alarmStatistics() {
|
|
|
- int count;
|
|
|
- int unresolvedCount;
|
|
|
+ int count=0;
|
|
|
+ int unresolvedCount=0;
|
|
|
//找出所有报警数据
|
|
|
List<MsgAlarm> list = this.list();
|
|
|
//未解除的报警
|
|
|
List<MsgAlarm> alarmList = this.list(new LambdaQueryWrapper<MsgAlarm>()
|
|
|
- .eq(MsgAlarm::getIsLock, 1));
|
|
|
+ .eq(MsgAlarm::getIsLock, 2));
|
|
|
HashMap<String, Integer> map = new HashMap<>();
|
|
|
if (!ObjectUtils.isEmpty(list)) {
|
|
|
//获取所有报警的相机编码
|
|
@@ -260,10 +260,13 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
|
|
|
int pu = list.size() - count;
|
|
|
map.put("highAlarmCount", count);
|
|
|
map.put("puAlarmCount", pu);
|
|
|
+ }else {
|
|
|
+ map.put("highAlarmCount", 0);
|
|
|
+ map.put("puAlarmCount", 0);
|
|
|
}
|
|
|
if (!ObjectUtils.isEmpty(alarmList)) {
|
|
|
//获取所有报警的相机编码
|
|
|
- //找出所有已解除报警数据 1=高铁的数量
|
|
|
+ //找出所有未解除报警数据 1=高铁的数量
|
|
|
unresolvedCount = (int) alarmList.stream()
|
|
|
.map(base -> baseCameraManagementMapper.selectOne(new LambdaQueryWrapper<BaseCameraManagement>()
|
|
|
.eq(BaseCameraManagement::getCameraCode, base)))
|
|
@@ -277,6 +280,9 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
|
|
|
int puUnresolvedCount = alarmList.size() - unresolvedCount;
|
|
|
map.put("highUnresolvedCount", unresolvedCount);
|
|
|
map.put("puUnresolvedCount", puUnresolvedCount);
|
|
|
+ }else {
|
|
|
+ map.put("highUnresolvedCount", 0);
|
|
|
+ map.put("puUnresolvedCount", 0);
|
|
|
}
|
|
|
return AjaxResult.success(map);
|
|
|
}
|