From e738a5f530c604ae93788ec0b30d30dc339c0aef Mon Sep 17 00:00:00 2001
From: chenxiwang <1520264117@qq.com>
Date: Mon, 19 Aug 2024 16:55:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9E=E6=97=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gunshi/project/xyt/timetask/DataTask.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java b/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java
index 4cb6567..e5dc8b3 100644
--- a/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java
+++ b/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java
@@ -48,6 +48,7 @@ import ru.olegcherednik.jackson_utils.JacksonUtils;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -285,8 +286,8 @@ public class DataTask {
                                     (existing, replacement) -> existing // 如果有冲突，保留现有的
                             )).values().stream().collect(Collectors.toList());
                             stPptnRService.saveBatch(rlist);
-                            // 使用最后一条更新到实时数据表
-                            StPptnR stPptnR1 = rlist.get(rlist.size() - 1);
+                            // 获取时间最大的一条更新到实时数据表
+                            StPptnR stPptnR1 = rlist.stream().max(Comparator.comparing(StPptnR::getTm)).get();
                             StPptnRReal stPptnRReal = new StPptnRReal();
                             stPptnRReal.setStcd(stPptnR1.getStcd());
                             stPptnRReal.setTm(stPptnR1.getTm());
@@ -525,8 +526,8 @@ public class DataTask {
                                     (existing, replacement) -> existing // 如果有冲突，保留现有的
                             )).values().stream().collect(Collectors.toList());
                             stRsvrRService.saveBatch(rlist);
-                            // 使用最后一条更新到实时数据表
-                            StRsvrR STRsvrR1 = rlist.get(rlist.size() - 1);
+                            // 获取时间最大的一条更新到实时数据表
+                            StRsvrR STRsvrR1 = rlist.stream().max(Comparator.comparing(StRsvrR::getTm)).get();
                             StRsvrRReal stRsvrRReal = new StRsvrRReal();
                             stRsvrRReal.setStcd(STRsvrR1.getStcd());
                             stRsvrRReal.setTm(STRsvrR1.getTm());