泰和-升压站光字牌、模拟量、网络状态显示问题及排序

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

@@ -855,29 +855,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                     data = listDatum.getDisplayName();
                 }
             }
+            statusMap.put("addres",listDatum.getAddress());
             statusMap.put("data", data);
             statusMap.put("state", listDatum.getValue().equals("false") ? 0 : 1);
             statusMap.put("status", listDatum.getValue().equals("false") ? 0 : 1);
-            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") ? "通" : "断");
-            }
-
-
-
-
+            statusMap.put("title", listDatum.getValue().equals("false") ? "断" : "通");
             statusMaps.add(statusMap);
         }
-
-        Collator instance = Collator.getInstance(Locale.CHINA);
-        Collections.sort(statusMaps, (e1, e2) -> {
-            return instance.compare(e1.get("data"), e2.get("data"));
-        });
-
+        statusMaps.sort(Comparator.comparingLong(o -> Long.parseLong(o.get("addres").toString())));
         return statusMaps;
     }