From 1bc5a7615b0207660a9c2422851f8521d5a92eea Mon Sep 17 00:00:00 2001
From: chenxiwang <1520264117@qq.com>
Date: Wed, 28 Aug 2024 10:58:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B4=AA=E6=B0=B4=E9=A2=84?=
 =?UTF-8?q?=E6=B5=8B=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ForecastResultsController.java   |  2 +-
 .../xyt/service/ForecastResultsService.java     | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastResultsController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastResultsController.java
index 0e876a0..7537208 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/ForecastResultsController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastResultsController.java
@@ -83,7 +83,7 @@ public class ForecastResultsController {
 
     @Operation(summary = "获取人工交互洪水预报结果")
     @PostMapping("/getHumanForecastResult")
-    public R<ForecastProject> getHumanForecastResult(@RequestBody ForecastTask forecastTask) throws Exception {
+    public R<ForecastProject> getHumanForecastResult(@RequestBody ForecastTask forecastTask) {
         ForecastProject forecastProject = new ForecastProject();
         List<ForecastResultVo> voList = service.getHumanForecastResult(forecastTask);
         forecastProject.setType("2");
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 137d4ff..b5bf7b7 100644
--- a/src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
@@ -112,7 +112,7 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
      * @auther: cxw
      * @date: 2024-07-31, 周三, 11:09:24
      */
-    public List<ForecastResultVo> getHumanForecastResult(ForecastTask forecastTask) throws Exception {
+    public List<ForecastResultVo> getHumanForecastResult(ForecastTask forecastTask) {
         // 当前时间整点，作为获取雨量数据历史、预测分隔点
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.MINUTE, 0);
@@ -120,8 +120,13 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
         calendar.set(Calendar.MILLISECOND, 0);
         Date nowHourTime = calendar.getTime();
         forecastTask.setNowTime(nowHourTime);
-        List<ForecastResultVo> voList = excuteForecast(forecastTask);
-        voList.sort(Comparator.comparing(ForecastResultVo::getTm));
+        List<ForecastResultVo> voList = null;
+        try {
+            voList = excuteForecast(forecastTask);
+            voList.sort(Comparator.comparing(ForecastResultVo::getTm));
+        } catch (Exception e) {
+            throw new IllegalArgumentException("数据异常！");
+        }
         return voList;
     }
 
@@ -221,10 +226,16 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
             if (CollectionUtils.isNotEmpty(filterList)) {
                 retMap = reorganizePptnRData(filterList, dt, period[0], period[1]);
             }
+            if(ObjectUtils.isEmpty(retMap.get("listForForecast"))){
+                continue;
+            }
             List<String> pForecastList = retMap.get("listForForecast").stream().map(s -> s.getDrp()).collect(Collectors.toList());
             if(pForecastList.size() == 0){
                 continue;
             }
+            if(ObjectUtils.isEmpty(retMap.get("listForReal"))){
+                continue;
+            }
             Map<String, String> pRealMap = retMap.get("listForReal").stream().collect(Collectors.toMap(pptnR -> sdfMinute.format(pptnR.getTm()), StPptnR::getDrp));
             double[] PList = pForecastList.stream().mapToDouble(Double::parseDouble).toArray();
             // 预测执行