#检修流程

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

@@ -17,6 +17,9 @@ public class HydropowerUnitVo {
 	@ApiModelProperty(value = "水电站机组名称")
 	private String deivceName;
 
+	@ApiModelProperty(value = "排序")
+	private Integer ord;
+
 	@ApiModelProperty(value = "水电站机组实时数据")
 	private HydropowerUnitRealVo hydropowerPumpRealVo;
 

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

@@ -641,6 +641,7 @@ public class HydropowerServiceImpl implements HydropowerService {
 			// 设备编号
 			hydropowerUnitVo.setDeivceCode(real.getDeviceCode());
 			hydropowerUnitVo.setDeivceName(real.getDeviceName());
+			hydropowerUnitVo.setOrd(real.getOrd());
 			// 实时数据
 			hydropowerUnitVo.setHydropowerPumpRealVo(real);
 			// 指标数据
@@ -652,7 +653,7 @@ public class HydropowerServiceImpl implements HydropowerService {
 			}
 			list.add(hydropowerUnitVo);
 		}
-		return list.stream().sorted(Comparator.comparing(HydropowerUnitVo::getDeivceCode)).collect(Collectors.toList());
+		return list.stream().sorted(Comparator.comparing(HydropowerUnitVo::getOrd)).collect(Collectors.toList());
 	}
 
 	/**