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

fix(消防系统): 消防系统>系统部件>查看设备:已经消除了所有告警后,实时信号应该清空

【web端】3720站端:消防系统>系统部件>查看设备:已经消除了所有告警后,实时信号应该清空 Closes http://113.142.68.105:5080/zentao/bug-view-15784.html
parent 55b15727
...@@ -88,6 +88,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe ...@@ -88,6 +88,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
@Autowired @Autowired
private IEquipmentIndexService equipmentIndexService; private IEquipmentIndexService equipmentIndexService;
@Autowired
private IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService;
@Lazy @Lazy
@Autowired @Autowired
...@@ -400,8 +402,16 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe ...@@ -400,8 +402,16 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
} }
} }
// 实时信号 // 实时信号
String signal = equipmentSpecificService.getEquipRealtimeSignal(id); int count = equipmentSpecificAlarmLogService.count(
equipmentDetail.setSignal(Objects.nonNull(signal) ? signal : "-"); Wrappers.<EquipmentSpecificAlarmLog>lambdaQuery()
.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificId, id)
.isNull(EquipmentSpecificAlarmLog::getCleanTime)
);
equipmentDetail.setSignal("-");
if (count > 0) {
String signal = equipmentSpecificService.getEquipRealtimeSignal(id);
equipmentDetail.setSignal(Objects.nonNull(signal) ? signal : "-");
}
// 二维码 // 二维码
String equipStatus = equipmentSpecific.getEquipStatus(); String equipStatus = equipmentSpecific.getEquipStatus();
int type = Objects.equals(equipStatus, "0") ? 3 : 1; int type = Objects.equals(equipStatus, "0") ? 3 : 1;
......
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