From 86cbae223a8494b2d4db3b5cd69c2910ced580fa Mon Sep 17 00:00:00 2001
From: chenxiwang <1520264117@qq.com>
Date: Tue, 6 Aug 2024 11:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B1=9E=E6=80=A7=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gunshi/project/xyt/entity/vo/ForecastResultVo.java    | 2 +-
 .../gunshi/project/xyt/service/ForecastResultsService.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/ForecastResultVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/ForecastResultVo.java
index 837d317..005ff6f 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/vo/ForecastResultVo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/ForecastResultVo.java
@@ -21,7 +21,7 @@ public class ForecastResultVo {
          * 时间
          */
         @Schema(description="时间")
-        private Date tm;
+        private String tm;
 
         /**
          * 预测入库流量
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 49364da..714edff 100644
--- a/src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
@@ -223,8 +223,7 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
                 for (int j = 0; j < forecastVoList.size(); j++) {
                     FloodAlgorithemVo floodAlgorithemVo = forecastVoList.get(j);
                     ForecastResultVo resultVo = new ForecastResultVo();
-                    Date dateTm = sdf.parse(floodAlgorithemVo.getDateStr());
-                    resultVo.setTm(dateTm);
+                    resultVo.setTm(floodAlgorithemVo.getDateStr());
                     resultVo.setYcRkQValue(floodAlgorithemVo.getRq());// 预测入库流量
 //                    resultVo.setRealRkQValue();// 暂无真实入库流量
                     resultVo.setYcCkQValue(floodAlgorithemVo.getCq());// 预测出库流量
@@ -248,6 +247,7 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
                         }
                     }
                     resultVo.setDrp(floodAlgorithemVo.getDrp());
+                    Date dateTm = sdf.parse(floodAlgorithemVo.getDateStr());
                     resultVo.setIspreDrp(dateTm.compareTo(nowHourTime) <= 0 ? "0" : "1");// 0：真实 1：预测
                     resultVo.setR(floodAlgorithemVo.getR());
                     resultVo.setFlLowLimLev(attResBase.getFlLowLimLev());