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 gribList = forecastService.getGribData(tm, false); + if(CollectionUtils.isEmpty(gribList)){ + return pptnRFutureList; + } //24小时每个网格的总量 List total = gribList.stream().filter(o -> o.getTmRange().getInterval() == 24).collect(Collectors.toList()); //24小时每个网格的逐小时雨量