From b7c3fc85eba070a5c6625bc680ae9993d5553fae Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 12 Mar 2024 16:25:56 +0800
Subject: [PATCH] hst预测定时器启用多线程请求

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HsybServiceImpl.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 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 0ac0610..e626338 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
@@ -84,16 +84,19 @@
 
 			HsybGetFuturePo hsybGetFuturePo = sendRequestToHsyb(GET_NEW_FUTURE, urlParams);
 
-			//程序转为hashmap,手动转换类型
-			List<NewSwFuturePo> data = JSON.parseArray(JSON.toJSONString(hsybGetFuturePo.getData()), NewSwFuturePo.class);
-			List<NewSwFuturePo> filterData = filterPredict(data);
+			if (hsybGetFuturePo.getData() !=null){
+				//程序转为hashmap,手动转换类型
+				List<NewSwFuturePo> data = JSON.parseArray(JSON.toJSONString(hsybGetFuturePo.getData()), NewSwFuturePo.class);
+				List<NewSwFuturePo> filterData = filterPredict(data);
 
-			log.info(StringUtil.format("过滤后的预测水位数据:{}", JSON.toJSONString(filterData)));
-			return filterData;
-//		}else{
-//			//拿不到预测水位
-//			return null;
-//		}
+				log.info(StringUtil.format("过滤后的预测水位数据:{}", JSON.toJSONString(filterData)));
+				return filterData;
+			}else {
+				//因为会有data为null的数据,所以返回空数组
+				List<NewSwFuturePo> list = new ArrayList<>();
+				return list;
+			}
+
 	}
 
 	public Boolean isResHasModel(String resId){
@@ -247,6 +250,7 @@
 
 		try {
 			ResponseEntity<HsybGetFuturePo> exchange = restTemplate.exchange(url, HttpMethod.GET, formEntity, HsybGetFuturePo.class);
+			log.info("请求结果:"+ exchange.getBody().toString());
 			return exchange.getBody();
 		} catch (Exception e) {
 			e.printStackTrace();

--
Gitblit v1.9.3