Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/BigScreenAnalyseController.java

@@ -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<>();