diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index 34ce45e8..e11b2450 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -324,16 +324,24 @@ public class MonitorService { } sp.setResCode(resCode); // 代表站 - SkRelStRes relStResJsonMode = queryDataOne(MonitorSourceEnum.DWS_REL_ST_RES, sp); - if (Objects.isNull(relStResJsonMode)) { + List relStResJsonModeList = queryDataList(MonitorSourceEnum.DWS_REL_ST_RES, sp); + if (CollectionUtils.isEmpty(relStResJsonModeList)) { return attResTaskViewDto; } - attResTaskViewDto.setStationName(relStResJsonMode.getStName()); - attResTaskViewDto.setStationCode(relStResJsonMode.getStCode()); - + SkRelStRes skRelStRes = relStResJsonModeList.stream() + .filter(e -> !StringUtils.isNotEmpty(e.getFlag())) + .filter(e -> Objects.equals(e.getFlag(), "1")) + .findFirst() + .orElse(null); + log.info("获取SkRelStRes返回数据:{}",JSON.toJSONString(skRelStRes)); + if (Objects.isNull(skRelStRes)) { + return attResTaskViewDto; + } + attResTaskViewDto.setStationName(skRelStRes.getStName()); + attResTaskViewDto.setStationCode(skRelStRes.getStCode()); // 当前水位 - sp.setStcd(relStResJsonMode.getStCode()); + sp.setStcd(skRelStRes.getStCode()); sp.setStartTime(BsSgcSkStatisticsService.getStartOfDay()); sp.setEndTime(BsSgcSkStatisticsService.getStartOfNextDay()); List msHdmRsvrFutureList = queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp);