Commit e8d4a69b authored by 李秀明's avatar 李秀明

fix: 今日报警次数统计替换为未复归设备数量统计

parent 6870274d
...@@ -1152,15 +1152,16 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -1152,15 +1152,16 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
.eq(EquipmentSpecific::getSystemId, id) .eq(EquipmentSpecific::getSystemId, id)
.eq(EquipmentSpecific::getSingle, true) .eq(EquipmentSpecific::getSingle, true)
); );
// 今日报警次数 // 未复归设备
Integer alarmCount = equipmentSpecificAlarmLogMapper.selectCount( List<EquipmentSpecificAlarmLog> equipSpecIds = equipmentSpecificAlarmLogMapper.selectList(
Wrappers.<EquipmentSpecificAlarmLog>lambdaQuery() Wrappers.<EquipmentSpecificAlarmLog>lambdaQuery()
.select(EquipmentSpecificAlarmLog::getEquipmentSpecificId)
.like(EquipmentSpecificAlarmLog::getSystemIds, id) .like(EquipmentSpecificAlarmLog::getSystemIds, id)
.eq(EquipmentSpecificAlarmLog::getStatus, "1") .eq(EquipmentSpecificAlarmLog::getStatus, "1")
.likeRight(EquipmentSpecificAlarmLog::getCreateDate, LocalDate.now().toString())
); );
int count = (int) equipSpecIds.stream().map(EquipmentSpecificAlarmLog::getEquipmentSpecificId).distinct().count();
list.add(new AlarmDataVO("部件总数", equipmentCount + " 个", false)); list.add(new AlarmDataVO("部件总数", equipmentCount + " 个", false));
list.add(new AlarmDataVO("今日报警次数", alarmCount + " 次", false)); list.add(new AlarmDataVO("未复归设备", count + " 个", false));
return list; return list;
} }
......
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