From 7f38997fb8bb9cdc56a56f37b06e9241273524d9 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Wed, 9 Oct 2024 15:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=BA=93=E5=AE=B9=E6=9B=B2?=
 =?UTF-8?q?=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyt/controller/ReservoirWaterController.java    |  5 +++++
 .../gunshi/project/xyt/entity/so/PicQuerySo.java    |  1 -
 .../gunshi/project/xyt/mapper/AttResBaseMapper.java | 11 +++++++++++
 .../project/xyt/service/ReservoirWaterService.java  | 13 ++++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java b/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java
index 1ac4896..49aeb99 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java
@@ -78,6 +78,11 @@ public class ReservoirWaterController {
         return R.ok(reservoirWaterService.data(dataQueryCommonSo));
     }
 
+    @Post(path = "/data/page", summary = "分页库容曲线")
+    public R<Page<AttResMonitorVo>> dataPage(@RequestBody @Validated PicQuerySo picQuerySo) {
+        return R.ok(reservoirWaterService.dataPage(picQuerySo));
+    }
+
     @Get(path = "/detail", summary = "监测详细数据（下方表格）")
     public R<AttRvMonitorDetailVo> detail(@Schema(name = "stcd") @RequestParam("stcd") String stcd) {
         return R.ok(reservoirWaterService.detail(stcd));
diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/PicQuerySo.java b/src/main/java/com/gunshi/project/xyt/entity/so/PicQuerySo.java
index e4f2396..b6b461c 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/so/PicQuerySo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/so/PicQuerySo.java
@@ -18,7 +18,6 @@ import lombok.Data;
 public class PicQuerySo {
 
     @Schema(description="水库编码")
-    @NotEmpty(message = "水库编码不可为空")
     private String resCode;
 
     @Schema(description="测站编码")
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java
index 6dd0e5d..6a42317 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java
@@ -189,4 +189,15 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
                         """)
     AttRvMonitorVo newRz(@Param("stcd") String stcd);
 
+    @Select("""
+            <script>
+            select t.stcd,t.tm,t.rz from public.st_rsvr_r t
+            where t.stcd = #{obj.stcd}
+                and t.tm <![CDATA[>=]]> to_timestamp(#{obj.stm},'YYYY-MM-DD HH24:MI:SS')
+                and t.tm <![CDATA[<=]]> to_timestamp(#{obj.etm},'YYYY-MM-DD HH24:MI:SS')
+                and TRIM(TO_CHAR(t.tm, 'MI:SS')) = '00:00'
+                order by t.tm desc
+              </script>
+                        """)
+    Page<AttResMonitorVo> rzDataPage(Page<AttResMonitorVo> page,@Param("obj") PicQuerySo picQuerySo);
 }
\ No newline at end of file
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 4a035db..cb1f4aa 100644
--- a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java
@@ -230,7 +230,18 @@ public class ReservoirWaterService {
         if(CollectionUtils.isNotEmpty(zvarl)){
             calcTqData(rzData,zvarl);
         }
-        //根据监测时间合并雨量和水位数据
+        return rzData;
+    }
+
+    public Page<AttResMonitorVo> dataPage(PicQuerySo picQuerySo) {
+        String stcd = picQuerySo.getStcd();
+        //水位数据
+        Page<AttResMonitorVo> rzData = attResBaseMapper.rzDataPage(picQuerySo.getPageSo().toPage(),picQuerySo);
+        //获取库容曲线关系，算出库容
+        List<StZvarlB> zvarl = zvarl(stcd);
+        if(CollectionUtils.isNotEmpty(zvarl)){
+            calcTqData(rzData.getRecords(),zvarl);
+        }
         return rzData;
     }
 }