洪水预报无数据

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;
 
         /**
          * 全流域面积

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小时每个网格的逐小时雨量