From 2e4f40a4e5aa9f4aa6666a8ab7ad8908cf1b7989 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Wed, 12 Jul 2023 08:05:26 +0800 Subject: [PATCH] =?UTF-8?q?#=E6=A3=80=E4=BF=AE=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hnac/hzims/operational/main/vo/HydropowerUnitVo.java | 3 +++ .../hzims/operational/main/service/impl/HydropowerServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/HydropowerUnitVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/HydropowerUnitVo.java index 33539d9..d3cd159 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/HydropowerUnitVo.java +++ b/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; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java index a8f4274..b66f7f5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java +++ b/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()); } /**