From ea972cfdb7bdc50322312b811cc8a6dddeec3561 Mon Sep 17 00:00:00 2001 From: liangshan Date: Wed, 2 Apr 2025 13:08:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E6=B0=B4=E8=83=BD=E5=8A=9B=E5=88=86?= =?UTF-8?q?=E6=9E=90=20-=E5=8F=AF=E4=BE=9B=E6=B0=B4=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gunshi/project/xyt/service/ReservoirWaterService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java index 899652e..652a456 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java @@ -2,6 +2,7 @@ package com.gunshi.project.xyt.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.project.xyt.entity.so.DataQueryCommonSo; @@ -70,6 +71,12 @@ public class ReservoirWaterService { BigDecimal maxRz = zvarlBS.stream().max(Comparator.comparing(StZvarlB::getRz)).get().getRz(); BigDecimal minRz = zvarlBS.stream().min(Comparator.comparing(StZvarlB::getRz)).get().getRz(); if(rz.compareTo(minRz) < 0 || rz.compareTo(maxRz) > 0){ + //当期水位库容 + StZvarlB equals = zvarlBS.stream().filter(e -> e.getRz().compareTo(vo.getRz()) == 0).findFirst().orElse(new StZvarlB()); + //死水位库容 + StZvarlB dead = zvarlBS.stream().filter(e -> e.getRz().compareTo(vo.getDeadCap()) == 0).findFirst().orElse(new StZvarlB()); + BigDecimal subtract = equals.getW().subtract(dead.getW()); + vo.setNowCap(subtract); continue; } Map stZvalMap = zvarlBS.stream().collect(Collectors.toMap(StZvarlB::getRz, StZvarlB::getW));