升压站问题处理

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java

@@ -83,6 +83,7 @@ public class CommonConstans {
     public static final String QueryStringGateWayId = "gatewayId.keyword";
     public static final String QueryStringFrontMoudle = "frontModule.keyword";
     public static final String QueryStringSystemType = "systemType";
+    public static final String QueryStringSystemTypeKeyword = "systemType.keyword";
     public static final String QueryStringEquipmentNumber = "equipmentNumber";
     public static final String QueryStringValue = "value";
     public static final String QueryStringValueKeyword = "value.keyword";

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

@@ -763,6 +763,7 @@ public class MonitorFanIdxController extends BaseController {
 
         List<Map<String, Object>> statusMonitoring = monitorFanIndicator.solarPowerOperation(gatewayId);
         List<Map<String, Object>> collect = statusMonitoring.stream()
+                .sorted(Comparator.comparing(t -> Integer.parseInt(t.get("sort").toString())))
                 .skip((long) (current - 1) * size)
                 .limit(size)
                 .collect(Collectors.toList());