#检修流程

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

@@ -28,4 +28,7 @@ public class AppHydropowerDeviceVo {
 
 	@ApiModelProperty(value = "负荷单位")
 	private String loadUnit;
+
+	@ApiModelProperty(value = "排序")
+	private Integer ord;
 }

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

@@ -61,4 +61,7 @@ public class HydropowerUnitRealVo {
 
 	@ApiModelProperty(value = "电流单位")
 	private String currentUnit;
+
+	@ApiModelProperty(value = "排序")
+	private Integer ord;
 }

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

@@ -179,7 +179,7 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl<EcologyFlowSt
     @Override
     public List<StationVo> station() {
         List<StationEntity> stations = stationService.list(Wrappers.<StationEntity>lambdaQuery()
-                .in(StationEntity::getCode,Arrays.asList("902400000054","902400052664")));
+                .in(StationEntity::getCode,Arrays.asList("902400000054","902400052664","902400056791")));
         if(CollectionUtil.isEmpty(stations)){
             return new ArrayList<>();
         }

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

@@ -153,6 +153,7 @@ public class HydropowerServiceImpl implements HydropowerService {
 			HydropowerUnitRealVo real = new HydropowerUnitRealVo();
 			real.setDeptId(device.getCreateDept());
 			real.setDeviceCode(device.getEmCode());
+			real.setOrd(device.getOrd());
 			real.setDeptName(device.getName());
 			real.setDeviceName(device.getName());
 			// 装机容量
@@ -1546,6 +1547,7 @@ public class HydropowerServiceImpl implements HydropowerService {
 				// 设备
 				hydropower.setDevices(devices.stream().map(real->{
 					AppHydropowerDeviceVo device = new AppHydropowerDeviceVo();
+					device.setOrd(real.getOrd());
 					device.setDeviceCode(real.getDeviceCode());
 					device.setDeviceName(real.getDeviceName());
 					device.setState(real.getState());
@@ -1553,7 +1555,7 @@ public class HydropowerServiceImpl implements HydropowerService {
 					device.setCapacity(real.getInstalledCapacity());
 					device.setLoad(real.getActivePower());
 					return device;
-				}).collect(Collectors.toList()));
+				}).sorted(Comparator.comparing(AppHydropowerDeviceVo::getOrd)).collect(Collectors.toList()));
 				hydropower.setLoadUnit(hydropower.getDevices().get(0).getLoadUnit());
 			}
 			return hydropower;