Commit c13259c8 authored by wujipeng's avatar wujipeng
Browse files

设备资产详情优化

parent ebef5eb7
...@@ -23,5 +23,8 @@ public class EquipmentVO extends EquipmentEntity { ...@@ -23,5 +23,8 @@ public class EquipmentVO extends EquipmentEntity {
@ApiModelProperty("是否有告警") @ApiModelProperty("是否有告警")
private Boolean hasAlarm; private Boolean hasAlarm;
@ApiModelProperty("告警说明")
private String alarmDesc;
private List<EquipmentParamEntity> realTime; private List<EquipmentParamEntity> realTime;
} }
...@@ -35,6 +35,12 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment ...@@ -35,6 +35,12 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
EquipmentVO result = baseMapper.detail(id); EquipmentVO result = baseMapper.detail(id);
List<EquipmentParamEntity> latestGroupByValue = equipmentParamService.getLatestGroupByName(id); List<EquipmentParamEntity> latestGroupByValue = equipmentParamService.getLatestGroupByName(id);
//判断有没有异常数据 //判断有没有异常数据
for (EquipmentParamEntity equipmentParamEntity : latestGroupByValue) {
if (equipmentParamEntity.getStatus()) {
result.setAlarmDesc(equipmentParamEntity.getName() + "异常");
break;
}
}
if (!latestGroupByValue.isEmpty()) { if (!latestGroupByValue.isEmpty()) {
result.setHasAlarm(latestGroupByValue.stream().anyMatch(EquipmentParamEntity::getStatus)); result.setHasAlarm(latestGroupByValue.stream().anyMatch(EquipmentParamEntity::getStatus));
} else { } else {
......
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