Commit 34b7fa08 authored by tangwei's avatar tangwei

修改排序状态值

parent 048ede6f
......@@ -852,7 +852,18 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
statusMap.put("data", data);
statusMap.put("state", listDatum.getValue().equals("false") ? 0 : 1);
statusMap.put("status", listDatum.getValue().equals("false") ? 0 : 1);
statusMap.put("title", listDatum.getValue().equals("false") ? "通" : "断");
if(listDatum.getEquipmentIndexName().equals("直流屏装置1网络状态1")||listDatum.getEquipmentIndexName().equals("直流屏装置2网络状态1")){
statusMap.put("title", listDatum.getValue().equals("false") ? "断" : "通");
}else{
statusMap.put("title", listDatum.getValue().equals("false") ? "通" : "断");
}
statusMaps.add(statusMap);
}
......@@ -884,6 +895,15 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
statusMap.put("title1", listDatum.getDisplayName());
statusMaps.add(statusMap);
}
Collator instance = Collator.getInstance(Locale.CHINA);
Collections.sort(statusMaps, (e1, e2) -> {
return instance.compare(e1.get("title1"), e2.get("title1"));
});
return statusMaps;
}
......
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