#风电

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/ecology/vo/DeviceVo.java

@@ -36,4 +36,7 @@ public class DeviceVo {
 
     @ApiModelProperty(value = "建议有功调整")
     private Double adjust;
+
+    @ApiModelProperty(value = "排序")
+    private Integer ord;
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java

@@ -235,6 +235,7 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl<EcologyFlowSt
             // 设备编号
             device.setDeviceCode(real.getDeviceCode());
             device.setDeviceName(real.getDeviceName());
+            device.setOrd(real.getOrd());
             device.setState(real.getState());
             device.setActive(real.getActivePower());
             device.setReactive(real.getReactivePower());
@@ -244,7 +245,7 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl<EcologyFlowSt
             device.setGenerate(0.0);
             list.add(device);
         }
-        return list.stream().sorted(Comparator.comparing(DeviceVo::getDeviceCode)).collect(Collectors.toList());
+        return list.stream().sorted(Comparator.comparing(DeviceVo::getOrd)).collect(Collectors.toList());
     }