From 0653c3ad63ae4f1070c6b34cfc6a12e1c59a54a1 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Wed, 9 Oct 2024 13:52:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E6=B5=8B=E6=9D=A5=E6=B0=B4=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/controller/GateValveRealController.java  | 6 ++++++
 .../gunshi/project/xyt/service/GateValveRealService.java | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/GateValveRealController.java b/src/main/java/com/gunshi/project/xyt/controller/GateValveRealController.java
index 6869896..77a175b 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/GateValveRealController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/GateValveRealController.java
@@ -94,4 +94,10 @@ public class GateValveRealController {
     public R<Map<BigDecimal, String>> supplyTime(@RequestParam(value = "year",required = false) @Parameter(description = "年份") Integer year,@RequestParam(value = "month",required = false) @Parameter(description = "月份") Integer month) {
         return R.ok(service.supplyTime(year,month));
     }
+
+    @Operation(summary = "预测来水量")
+    @GetMapping("/predict/water")
+    public R<BigDecimal> predictWater(@RequestParam(value = "year") @Parameter(description = "年份") Integer year, @RequestParam(value = "month") @Parameter(description = "月份") Integer month) {
+        return R.ok(service.predictWater(year,month));
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/service/GateValveRealService.java b/src/main/java/com/gunshi/project/xyt/service/GateValveRealService.java
index 2be5661..ba7955b 100644
--- a/src/main/java/com/gunshi/project/xyt/service/GateValveRealService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/GateValveRealService.java
@@ -126,7 +126,7 @@ public class GateValveRealService extends ServiceImpl<GateValveRealMapper, GateV
         }
         AttResBaseVo attResBaseVo = list.get(0);
         BigDecimal nowCap = attResBaseVo.getNowCap() == null ? new BigDecimal(0) : attResBaseVo.getNowCap();
-        BigDecimal deadCap = attResBaseVo.getDeadCap();
+        BigDecimal deadCap = attResBaseVo.getDeadCap() == null ? new BigDecimal(0) : attResBaseVo.getDeadCap();
 
         BigDecimal supplyV = nowCap.subtract(deadCap);
         if(year != null){
@@ -170,6 +170,13 @@ public class GateValveRealService extends ServiceImpl<GateValveRealMapper, GateV
         return sum.multiply(watShedArea);
     }
 
+    public BigDecimal predictWater(Integer year, Integer month) {
+        List<AttResBaseVo> list = reservoirWaterService.list();
+        if(CollectionUtils.isEmpty(list)){
+            return new BigDecimal(0);
+        }
+        return calcPredictV(year,month,list.get(0).getWatShedArea());
+    }
 }