Commit f2c275b5 authored by zhangsen's avatar zhangsen

bug修改

parent c052b9b1
......@@ -504,6 +504,7 @@ public class BigScreenAnalyseController extends BaseController {
String warningName = equipmentHealthIndexMap.getOrDefault(item.get("pointName"), "安全");
int sort = 4;
item.put("warningName", warningName);
item.put("status", warningName);
if ("注意".equals(warningName)) {
sort = 1;
} else if ("警告".equals(warningName)) {
......@@ -604,7 +605,6 @@ public class BigScreenAnalyseController extends BaseController {
pointNameList.forEach(item -> {
String equipmentHealthScore = equipmentHealthIndexMap.getOrDefault(item.get("pointName"), "安全");
int sort = 4;
item.put("warningName", equipmentHealthScore);
if ("注意".equals(equipmentHealthScore)) {
sort = 1;
} else if ("警告".equals(equipmentHealthScore)) {
......@@ -614,6 +614,7 @@ public class BigScreenAnalyseController extends BaseController {
}
item.put("sort", sort);
item.put("warningName", equipmentHealthScore);
item.put("status", equipmentHealthScore);
});
pointNameList.sort(Comparator.comparing(o -> o.get("sort").toString()));
Page<Map<String, Object>> mapPage = new Page<>();
......
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