通用接口排序问题处理

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

@@ -851,16 +851,17 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             }
             statusMaps.add(statusMap);
         }
-        Collator instance = Collator.getInstance(Locale.CHINA);
+//        Collator instance = Collator.getInstance(Local);
         String sortField;
         if(traceIdCount == statusMaps.size()){
             sortField = "traceId";
         } else {
             sortField = "addres";
         }
-        Collections.sort(statusMaps, (e1, e2) -> {
-            return instance.compare(e1.get(sortField), e2.get(sortField));
-        });
+//        Collections.sort(statusMaps, (e1, e2) -> {
+//            return instance.compare(Integer.valueOf(e1.get(sortField).toString()), Integer.valueOf(e2.get(sortField).toString()));
+//        });
+        statusMaps.sort(Comparator.comparingInt(o -> Integer.parseInt(o.get(sortField).toString())));
         return statusMaps;
     }
 
@@ -880,6 +881,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             statusMap.put("traceId",listDatum.getTraceId());
             statusMap.put("displayName",listDatum.getDisplayName());
             statusMap.put("equipmentIndexName",listDatum.getEquipmentIndexName());
+            statusMap.put("equipmentIndexName",listDatum.getEquipmentIndexName());
             statusMap.put("unit",listDatum.getUnit());
             statusMap.put("value",listDatum.getValue());
             statusMap.put("id", listDatum.getId());
@@ -895,12 +897,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         String sortField;
         if(traceIdCount == statusMaps.size()){
             sortField = "traceId";
+            statusMaps.sort(Comparator.comparingInt(o -> Integer.parseInt(o.get(sortField).toString())));
         } else {
             sortField = "title1";
+            Collections.sort(statusMaps, (e1, e2) -> {
+                return instance.compare(e1.get(sortField), e2.get(sortField));
+            });
         }
-        Collections.sort(statusMaps, (e1, e2) -> {
-            return instance.compare(e1.get(sortField), e2.get(sortField));
-        });
+
         return statusMaps;
     }