From b40854796487fe3badf5786e6092d57f1cb6b9a8 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Fri, 5 Sep 2025 16:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=BA=93=E6=B0=B4=E6=83=85-=E6=B2=B3?=
 =?UTF-8?q?=E9=81=93=E6=B0=B4=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gunshi/project/hsz/model/StRiverR.java    |  2 +-
 .../gunshi/project/hsz/model/StRsvrRReal.java |  9 ++++-
 .../hsz/service/ReservoirWaterService.java    | 37 ++++++++++++++++++-
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gunshi/project/hsz/model/StRiverR.java b/src/main/java/com/gunshi/project/hsz/model/StRiverR.java
index 188a936..d6d7e0d 100644
--- a/src/main/java/com/gunshi/project/hsz/model/StRiverR.java
+++ b/src/main/java/com/gunshi/project/hsz/model/StRiverR.java
@@ -22,7 +22,7 @@ import java.util.Date;
 * author: cxw
 * date: 2024-09-24 14:01:07
 */
-@Schema(description="")
+@Schema(description="河道水位表")
 @Data
 @TableName("public.st_river_r")
 public class StRiverR implements Serializable {
diff --git a/src/main/java/com/gunshi/project/hsz/model/StRsvrRReal.java b/src/main/java/com/gunshi/project/hsz/model/StRsvrRReal.java
index 313fe5f..3991383 100644
--- a/src/main/java/com/gunshi/project/hsz/model/StRsvrRReal.java
+++ b/src/main/java/com/gunshi/project/hsz/model/StRsvrRReal.java
@@ -40,8 +40,15 @@ public class StRsvrRReal implements Serializable {
         @NotBlank(message = "stcd不能为空")
         private String stcd;
 
+
         /**
-        * tm
+         * stnm
+         */
+        @TableField(exist=false)
+        private String stnm;
+
+        /**
+         * tm
         */
         @TableField(value="tm")
         @Schema(description="tm")
diff --git a/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java b/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java
index 33925c2..0210be7 100644
--- a/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.hsz.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,6 +49,14 @@ public class ReservoirWaterService {
     @Autowired
     private StZvarlBService stZvarlBService;
 
+    @Autowired
+    private StRiverRRealService stRiverRRealServices;
+
+
+    //实时供水
+    @Autowired
+    private StWaterRRealService stWaterRRealService;
+
     public List<AttResBaseVo> list() {
         List<AttResBaseVo> attResBaseVos = attResBaseMapper.queryList();
         if(CollectionUtils.isEmpty(attResBaseVos)){
@@ -104,7 +113,7 @@ public class ReservoirWaterService {
     }
 
 
-    public List<AttResBaseVo> listV2() {
+    public List<AttResBaseVo>  listV2() {
         List<AttResBaseVo> voList = attResBaseMapper.queryListV2();
         if(CollectionUtils.isEmpty(voList)){
             return voList;
@@ -121,11 +130,37 @@ public class ReservoirWaterService {
 
             BigDecimal rz = vo.getRz();
             if (rz != null) {
+                //TODO 这里可能也要更改一下水位-库容的计算方式，不能直接进行水库库容曲线的判断
                 BigDecimal w = stZvarlBService.getWFromZvarl(rz, null, zvarlList);
                 vo.setNowCap(w);
             }
         });
 
+        //TODO 计算2个灌溉站的流量之和
+        BigDecimal totalSum = BigDecimal.ZERO;
+        String stcd1 = "1112";
+        QueryWrapper<StWaterRReal> irrQw1 = new QueryWrapper<>();
+        irrQw1.eq("stcd", stcd1).orderBy(true, false, "tm");
+        StWaterRReal stWaterRReal1 = stWaterRRealService.getOne(irrQw1);
+        if(stWaterRReal1 != null){
+            totalSum.add(stWaterRReal1.getQ());
+        }
+        String stcd2 = "1113";
+        QueryWrapper<StWaterRReal> irrQw2 = new QueryWrapper<>();
+        irrQw2.eq("stcd", stcd2).orderBy(true, false, "tm");
+        StWaterRReal stWaterRReal2 = stWaterRRealService.getOne(irrQw2);
+        if(stWaterRReal2 != null){
+            totalSum.add(stWaterRReal2.getQ());
+        }
+        voList.stream().forEach(o -> o.setIrrigationFlowSum(totalSum));
+        //获取生态供水流量
+        String ecologyStcd = "1114";
+        QueryWrapper<StWaterRReal> ecologyQw = new QueryWrapper<>();
+        ecologyQw.eq("stcd", ecologyStcd).orderBy(true, false, "tm");
+        StWaterRReal ecologyWaterRReal = stWaterRRealService.getOne(ecologyQw);
+        if(ecologyWaterRReal != null){
+            voList.stream().forEach(o -> o.setEcologyFlow(ecologyWaterRReal.getQ()));
+        }
         return voList;
     }