From f1963584659c0964977b7c978b98a533879665ae Mon Sep 17 00:00:00 2001
From: cxw <1520264117@qq.com>
Date: Mon, 9 Sep 2024 18:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=AA=E6=B0=B4=E9=A2=84=E6=8A=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gunshi/project/xyt/service/ForecastResultsService.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 daae8e7..b7338d9 100644
--- a/src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
@@ -443,7 +443,11 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
         calendar.setTime(startTm);
         Date dataTm = calendar.getTime();
         // 使用时间一直往后加时间
-        while (dataTm.compareTo(endTm) < 0 && dataTm.compareTo(nowHourTime) <= 0 && !isHaveFuturePPtn) {
+        while (dataTm.compareTo(endTm) < 0) {
+            // 当数据时间超过实时数据的最大时间并且没有预测雨量数据时，跳出
+            if(dataTm.compareTo(nowHourTime) >= 0 && !isHaveFuturePPtn){
+                break;
+            }
             // 时间加1小时，得到应该拆数据的时间，后面往前推
             calendar.add(Calendar.HOUR_OF_DAY, 1);
             String shareDrp = "";// 应该分的drp