风机状态公共方法处理

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -106,6 +106,7 @@ public class MonitorFanIdxController extends BaseController {
         List<ESEquipmentsDTO> fanStatusList = monitorFanIndicator.getFanStatusList(stationId);
         Page<ESEquipmentsDTO> page = new Page<>(current, size);
         List<ESEquipmentsDTO> collect = fanStatusList.stream()
+                .sorted(Comparator.comparing(t -> Integer.parseInt(t.getEquipmentNumber())))
                 .skip((long) (current - 1) * size)
                 .limit(size)
                 .collect(Collectors.toList());

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/ESEquipmentsDTO.java

@@ -25,4 +25,5 @@ public class ESEquipmentsDTO {
     private String  pictureName;
     private String  displayName;
     private String state;
+    private String color;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -295,13 +295,25 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<ESEquipments> equipNumList = commonServiceImpl.getListDataByCondtions(queryCondtion1, null, ESEquipments.class);
         Map<String, String> collect = CollectionUtils.isEmpty(result) ? new HashMap<String, String>() : result.stream().collect(Collectors.toMap(ESEquipments::getEquipmentNumber, ESEquipments::getEquipmentIndexName, (item1, item2) -> item1));
 
+        HashMap<String, String> colorMap = new HashMap<>();
+        colorMap.put("正常运行", "#00aa00");
+        colorMap.put("报警运行", "#ffc400");
+        colorMap.put("停机状态", "#0055ff");
+        colorMap.put("故障状态", "#ff0000");
+        colorMap.put("限功率", "#a3f5aa");
+        colorMap.put("待机状态", "#00aaff");
+        colorMap.put("维护状态", "#ff00ff");
+        colorMap.put("通讯中断", "#7d8e95");
+
         List<ESEquipmentsDTO> resultList = new ArrayList<>();
         equipNumList.forEach(item -> {
             String status = ObjectUtils.isEmpty(CommonConstans.fanStatus.get(collect.get(item.getEquipmentNumber()))) ? "通讯中断" : CommonConstans.fanStatus.get(collect.get(item.getEquipmentNumber()));
             item.setAddress(status);
             ESEquipmentsDTO esEquipmentsDTO = new ESEquipmentsDTO();
             BeanUtil.copyProperties(item, esEquipmentsDTO);
+            String color = colorMap.get(status);
             esEquipmentsDTO.setState(status);
+            esEquipmentsDTO.setColor(color);
             resultList.add(esEquipmentsDTO);
         });