From 65743c7ef4fd9db013e605f15d347843923bb807 Mon Sep 17 00:00:00 2001 From: luyie Date: Sat, 7 Jun 2025 13:28:40 +0800 Subject: [PATCH] =?UTF-8?q?add:app=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=89=8D=E6=B1=A0=E6=B0=B4=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/main/vo/AppHydropowerStationVo.java | 3 +++ .../operational/main/service/impl/HydropowerServiceImpl.java | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AppHydropowerStationVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AppHydropowerStationVo.java index 9ce7719..c53a9b6 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AppHydropowerStationVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AppHydropowerStationVo.java @@ -61,4 +61,7 @@ public class AppHydropowerStationVo { @ApiModelProperty("站点告警列表") private List devices; + + @ApiModelProperty(value = "前池水位") + private Double frontWaterLevel; } 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 895bb27..6f96611 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 @@ -1539,6 +1539,10 @@ public class HydropowerServiceImpl implements HydropowerService { Map weekWeather = this.weatherService.getWeekWeather(stations.stream().map(StationEntity::getCode).collect(Collectors.toList())); // 实时监测点数据 List reals = (List) redisTemplate.opsForValue().get(load_hydropower_unit_real_key); + /** + * 水位 + */ + List levelList = (List) redisTemplate.opsForValue().get(loadwater_level_key); return stations.stream().map(station -> { AppHydropowerStationVo hydropower = new AppHydropowerStationVo(); hydropower.setDeptId(station.getRefDept()); @@ -1582,6 +1586,13 @@ public class HydropowerServiceImpl implements HydropowerService { }).sorted(Comparator.comparing(AppHydropowerDeviceVo::getOrd)).collect(Collectors.toList())); hydropower.setLoadUnit(hydropower.getDevices().get(0).getLoadUnit()); } + if(!CollectionUtil.isEmpty(levelList)){ + List validList = levelList.stream().filter(o-> station.getCode().equals(o.getStationCode())).collect(Collectors.toList()); + if(!CollectionUtil.isEmpty(validList)){ + WaterLevelVo level = validList.get(0); + hydropower.setFrontWaterLevel(level.getFrontWaterLevel()); + } + } return hydropower; }).sorted(Comparator.comparing(AppHydropowerStationVo::getSort)).collect(Collectors.toList()); }