12827

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -354,6 +354,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
                 }
             }
             item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? "正常" : "异常");
+            if("正常".equals(item.get("stateDesc").toString())){
+                item.put("sort",0);
+            } else {
+                item.put("sort",1);
+            }
             return item;
         }).collect(Collectors.toList());
         List<Map<String, Object>> stateMap = fireFightingSystemMapper.queryStartAndStopBySpecificId(ids);
@@ -380,6 +385,9 @@ public class SupervisionConfigureController extends AbstractBaseController {
             item.put("nameKey", pressurePumpStart);
             return item;
         }).collect(Collectors.toList());
+        List<Map<String, Object>> records = pressurePumpInfo.getRecords();
+        records.sort((t1, t2) -> t2.get("sort").toString().compareTo(t1.get("sort").toString()));
+        pressurePumpInfo.setRecords(records);
         return CommonResponseUtil.success(pressurePumpInfo);
     }