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

fix(消防装备): 装备-“实时信号”显示内容修改为:最新的、未消除的告警类型

parent f5fca530
...@@ -403,14 +403,16 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe ...@@ -403,14 +403,16 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
} }
} }
// 实时信号 // 实时信号
int count = equipmentSpecificAlarmLogService.count( List<EquipmentSpecificAlarmLog> alarmLogs = equipmentSpecificAlarmLogService.list(
Wrappers.<EquipmentSpecificAlarmLog>lambdaQuery() Wrappers.<EquipmentSpecificAlarmLog>lambdaQuery()
.select(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexName)
.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificId, id) .eq(EquipmentSpecificAlarmLog::getEquipmentSpecificId, id)
.isNull(EquipmentSpecificAlarmLog::getCleanTime) .isNull(EquipmentSpecificAlarmLog::getCleanTime)
.orderByDesc(EquipmentSpecificAlarmLog::getCreateDate)
); );
equipmentDetail.setSignal("-"); equipmentDetail.setSignal("-");
if (count > 0) { if (!alarmLogs.isEmpty()) {
String signal = equipmentSpecific.getRealtimeIotIndexName(); String signal = alarmLogs.get(0).getEquipmentSpecificIndexName();
equipmentDetail.setSignal(Objects.nonNull(signal) ? signal : "-"); equipmentDetail.setSignal(Objects.nonNull(signal) ? signal : "-");
} }
// 二维码 // 二维码
......
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