From c29ce51617cacf6d2fc2802490133d9063e927f6 Mon Sep 17 00:00:00 2001
From: chenxiwang <1520264117@qq.com>
Date: Fri, 26 Jul 2024 16:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=80=81=E6=B5=81?=
 =?UTF-8?q?=E9=87=8F=E7=9B=91=E6=8E=A7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyt/controller/StWaterRController.java    | 43 +++++++++++++++++++
 .../gunshi/project/xyt/model/StWaterR.java    |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java
index 2896176..c11ca79 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java
@@ -9,8 +9,10 @@ import com.gunshi.core.result.R;
 import com.gunshi.db.dto.DateTimeRangeSo;
 import com.gunshi.project.xyt.entity.vo.StWaterRVo;
 import com.gunshi.project.xyt.model.ResMonthEcoFlow;
+import com.gunshi.project.xyt.model.StStbprpB;
 import com.gunshi.project.xyt.model.StWaterR;
 import com.gunshi.project.xyt.service.ResMonthEcoFlowService;
+import com.gunshi.project.xyt.service.StStbprpBService;
 import com.gunshi.project.xyt.service.StWaterRService;
 import com.gunshi.project.xyt.util.ConvertUtil;
 import com.gunshi.project.xyt.util.DateUtil;
@@ -27,6 +29,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +51,9 @@ public class StWaterRController {
     @Autowired
     private ResMonthEcoFlowService resMonthEcoFlowService;
 
+    @Autowired
+    private StStbprpBService stStbprpBService;
+
 
     @Operation(summary = "新增")
     @PostMapping("/insert")
@@ -123,4 +129,41 @@ public class StWaterRController {
     public R<Map<String, BigDecimal>> stat(@RequestBody @Validated DateTimeRangeSo dateTimeRangeSo) {
         return R.ok(service.stat(dateTimeRangeSo));
     }
+
+
+    @Operation(summary = "生态流量监控-列表")
+    @PostMapping("/ecologyFlowList")
+    public R<List<StWaterR>> ecologyFlowList(@RequestBody @Validated StWaterR stWaterR) {
+        // 查询生态（放水管流量站QQ）
+        StStbprpB stStbprpB = stStbprpBService.getOne(new QueryWrapper<StStbprpB>().eq("sttp", "QQ").last(" limit 1"));
+        if(ObjectUtils.isEmpty(stStbprpB) || StringUtils.isEmpty(stStbprpB.getStcd())){
+            return R.ok(new ArrayList<>());
+        }
+        QueryWrapper<StWaterR> wrapper = new QueryWrapper<StWaterR>()
+                .eq("stcd", stStbprpB.getStcd())
+                .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime())
+                .le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime());
+        if(StringUtils.isNotBlank(stWaterR.getSortField())){
+            wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getSortField());
+        }
+        return R.ok(service.list(wrapper));
+    }
+
+    @Operation(summary = "生态流量监控-分页")
+    @PostMapping("/ecologyFlowPage")
+    public R<Page<StWaterR>> ecologyFlowPage(@RequestBody @Validated StWaterR stWaterR) {
+        // 查询生态（放水管流量站QQ）
+        StStbprpB stStbprpB = stStbprpBService.getOne(new QueryWrapper<StStbprpB>().eq("sttp", "QQ").last(" limit 1"));
+        if(ObjectUtils.isEmpty(stStbprpB) || StringUtils.isEmpty(stStbprpB.getStcd())){
+            return R.ok(new Page<>());
+        }
+        QueryWrapper<StWaterR> wrapper = new QueryWrapper<StWaterR>()
+                .eq("stcd", stStbprpB.getStcd())
+                .ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime())
+                .le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime());
+        if(StringUtils.isNotBlank(stWaterR.getSortField())){
+            wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getSortField());
+        }
+        return R.ok(service.page(stWaterR.getPageSo().toPage(), wrapper));
+    }
 }
diff --git a/src/main/java/com/gunshi/project/xyt/model/StWaterR.java b/src/main/java/com/gunshi/project/xyt/model/StWaterR.java
index a070743..d24eece 100644
--- a/src/main/java/com/gunshi/project/xyt/model/StWaterR.java
+++ b/src/main/java/com/gunshi/project/xyt/model/StWaterR.java
@@ -38,7 +38,7 @@ public class StWaterR extends GenericPageParams implements Serializable {
         @TableId(value="stcd", type= IdType.AUTO)
         @Schema(description="测站编码")
         @Size(max = 20,message = "测站编码最大长度要小于 20")
-        @NotBlank(message = "测站编码不能为空")
+//        @NotBlank(message = "测站编码不能为空")
         private String stcd;
 
         /**