From bf9b0c2c066b5e6fd1b3c344db1449341794a67a Mon Sep 17 00:00:00 2001
From: cxw <1520264117@qq.com>
Date: Tue, 8 Apr 2025 10:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=AA=E6=B0=B4=E9=A2=84=E6=8A=A5=E6=97=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/gunshi/project/xyt/model/AttResBase.java | 2 +-
 .../gunshi/project/xyt/service/ForecastResultsService.java | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gunshi/project/xyt/model/AttResBase.java b/src/main/java/com/gunshi/project/xyt/model/AttResBase.java
index c3230ed..c45566c 100644
--- a/src/main/java/com/gunshi/project/xyt/model/AttResBase.java
+++ b/src/main/java/com/gunshi/project/xyt/model/AttResBase.java
@@ -519,7 +519,7 @@ public class AttResBase implements Serializable {
         */
         @TableField(value="benefit")
         @Schema(description="供水效益")
-        private BigDecimal benefit;
+        private String benefit;
 
         /**
          * 全流域面积
diff --git a/src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java b/src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
index 30f6e7f..9e1396d 100644
--- a/src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
@@ -195,6 +195,10 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
             // 获取预报数据
             try {
                 pptnRFutureList = getForecastDrpData(nowHourTime, "");
+                if(CollectionUtils.isEmpty(pptnRFutureList)) {
+                    isHaveFuturePPtn = false;
+                    log.error("该时间无预报数据");
+                }
             } catch (IllegalArgumentException e) {
                 isHaveFuturePPtn = false;
                 log.error("该时间无预报数据");
@@ -413,6 +417,9 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
         }
         tm = tm.replaceAll(" ", "").replaceAll("-", "");
         List<RainGrib2Layer> gribList = forecastService.getGribData(tm, false);
+        if(CollectionUtils.isEmpty(gribList)){
+            return pptnRFutureList;
+        }
         //24小时每个网格的总量
         List<RainGrib2Layer> total = gribList.stream().filter(o -> o.getTmRange().getInterval() == 24).collect(Collectors.toList());
         //24小时每个网格的逐小时雨量