Commit db86e30e authored by caotao's avatar caotao

优化光字牌显示名称逻辑

parent 80d875f1
......@@ -846,14 +846,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
for (ESEquipments listDatum : indicatorsDtoList) {
Map<String, Object> statusMap = new HashMap<>();
String data = listDatum.getDisplayName();
if (StringUtils.isEmpty(data)) {
if (StringUtils.isEmpty(data)||(!ObjectUtils.isEmpty(listDatum.getEquipmentNumber())&&data.equals(listDatum.getEquipmentNumber()))) {
data = listDatum.getEquipmentIndexName();
} else {
if (data.equals(listDatum.getEquipmentNumber())) {
data = listDatum.getEquipmentIndexName();
} else {
data = listDatum.getDisplayName();
}
}
statusMap.put("addres", listDatum.getAddress());
statusMap.put("data", data);
......
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