From 1ea3061e39af14181bf6a012e964a247456267da Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 06 Mar 2024 09:47:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HstPredictServiceImpl.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HstPredictServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HstPredictServiceImpl.java
index 65473b3..cdeee08 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HstPredictServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HstPredictServiceImpl.java
@@ -37,12 +37,12 @@
 	@Override
 	public void getData(String type) {
 		List<DataResChildrenPo> cdList = getCdList(type);
-		List<DataResChildrenPo> collect = cdList.stream().filter(
-//			item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42128140006")
-			item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42130350046")|| item.getRes_cd().equals("42092250024")|| item.getRes_cd().equals("42022250039")|| item.getRes_cd().equals("42132150292")
-
-		).collect(Collectors.toList());
-		collect.forEach(dataResChildrenPo -> {
+//		List<DataResChildrenPo> collect = cdList.stream().filter(
+////			item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42128140006")
+//			item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42130350046")|| item.getRes_cd().equals("42092250024")|| item.getRes_cd().equals("42022250039")|| item.getRes_cd().equals("42132150292")
+//
+//		).collect(Collectors.toList());
+		cdList.forEach(dataResChildrenPo -> {
 			//循环请求预测结果
 			QueryReqPo queryReqPo = new QueryReqPo(dataResChildrenPo, type);
 			//请求预测结果
@@ -60,13 +60,13 @@
 	public void predictData(String type) {
 		List<DataResChildrenPo> cdList = getCdList(type);
 		//暂时筛选出数据
-		List<DataResChildrenPo> collect = cdList.stream().filter(
-			item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42130350046")|| item.getRes_cd().equals("42092250024")|| item.getRes_cd().equals("42022250039")|| item.getRes_cd().equals("42132150292")
-		).collect(Collectors.toList());
+//		List<DataResChildrenPo> collect = cdList.stream().filter(
+//			item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42130350046")|| item.getRes_cd().equals("42092250024")|| item.getRes_cd().equals("42022250039")|| item.getRes_cd().equals("42132150292")
+//		).collect(Collectors.toList());
 
 //		predict(collect,type);
 
-		newPredict(collect,type);
+		newPredict(cdList,type);
 
 
 	}

--
Gitblit v1.9.3