From 3c096d3cfd56a23e6794f30ccd150bfe19aa4ae8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 11 Aug 2023 14:27:25 +0800
Subject: [PATCH] arima预测和hst预测更新最新数据;对预报水位去重

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HsybServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HsybServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HsybServiceImpl.java
index 97e9eb7..61aa3de 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HsybServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HsybServiceImpl.java
@@ -86,6 +86,7 @@
 		List<List<String>> collect = data.stream().filter(item -> item.get(0) != null).collect(Collectors.toList());
 		Integer index = findIndex(collect, "/");
 
+		//对0点时间添加日期
 		if (index>-1){
 			collect.get(index).set(0,tomorrow  + collect.get(index).get(0).substring(5));
 		}
@@ -99,13 +100,19 @@
 				collect.get(i).set(0,today + " " + collect.get(i).get(0));
 			}
 		}
-		List<List<String>> filterData =  data.stream().filter(item -> item.get(0) != null).filter(item -> CommonUtil.strToDate(item.get(0)).after(DateUtil.now())).collect(Collectors.toList());
 
+		//筛选出未来时间
+		List<List<String>> filterData =  collect.stream().filter(item -> CommonUtil.strToDate(item.get(0)).after(DateUtil.now())).collect(Collectors.toList());
+
+		//截取掉时间部分
 		filterData.forEach(e->{
 			e.set(0,e.get(0).split(" ")[0]);
 		});
 
-		return filterData;
+		//去除重复数据
+		List<List<String>> collect1 = filterData.stream().distinct().collect(Collectors.toList());
+
+		return collect1;
 	}
 
 	public Integer findIndex(List<List<String>> list,String reg){

--
Gitblit v1.9.3