From dadbaf3ce1e06a9ad84c66b0a7fe5fc3dfa39313 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 03 Aug 2023 17:13:27 +0800
Subject: [PATCH] 修复hst预测结果报错的问题

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/controller/TestController.java             |    2 +-
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ArimaPredictServiceImpl.java  |    2 +-
 skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/ArimaPredictReqPo.java |    6 ++----
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java           |   15 +++++++++++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/ArimaPredictReqPo.java b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/ArimaPredictReqPo.java
index a50b60e..fccfb9d 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/ArimaPredictReqPo.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/ArimaPredictReqPo.java
@@ -22,18 +22,16 @@
 
 	public ArimaPredictReqPo() {};
 
-	public ArimaPredictReqPo(String damId, String pointId, String type, int number) {
+	public ArimaPredictReqPo(String damId, String pointId, String type) {
 		this.damId = damId;
 		this.pointId = pointId;
 		this.type = type;
-		this.number = number;
 	}
 
-	public ArimaPredictReqPo (DataResChildrenPo pojo, String type, int number) {
+	public ArimaPredictReqPo (DataResChildrenPo pojo, String type) {
 		this.damId = pojo.getRes_cd();
 		this.pointId = pojo.getCd();
 		this.type = type;
-		this.number = number;
 	}
 
 }
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/controller/TestController.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/controller/TestController.java
index 3aac610..80140c1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/controller/TestController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/controller/TestController.java
@@ -35,7 +35,7 @@
 
 	@GetMapping(value = "/getTest2")
 	public R getTest2() {
-		ArimaPredictReqPo po = new ArimaPredictReqPo("42011640018","02","3",24);
+		ArimaPredictReqPo po = new ArimaPredictReqPo("42011640018","02","3");
 		nkyService.arimaPredict(po);
 		return R.data(null);
 	}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ArimaPredictServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ArimaPredictServiceImpl.java
index a61fcd0..e7558a0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ArimaPredictServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ArimaPredictServiceImpl.java
@@ -43,7 +43,7 @@
 	public void predictData(String type) {
 		List<DataResChildrenPo> cdList = getCdList(type);
 		cdList.forEach(dataResChildrenPo -> {
-			ArimaPredictReqPo arimaPredictReqPo = new ArimaPredictReqPo(dataResChildrenPo, type, 7);
+			ArimaPredictReqPo arimaPredictReqPo = new ArimaPredictReqPo(dataResChildrenPo, type);
 			//循环预测请求
 			nkyService.arimaPredict(arimaPredictReqPo);
 		});
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java
index 3104cbc..b4fd2fe 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java
@@ -70,8 +70,19 @@
 	@Override
 	public HstPredict hstQuery(QueryReqPo po) {
 		JSONObject jsonObject = requestNkyApi(HST_QUERY, JSON.toJSONString(po));
-		HstPredict hstPredict = jsonObject.toJavaObject(HstPredict.class);
-		return hstPredict;
+		if (jsonObject == null){
+			return null;
+		}
+		JSONArray data = jsonObject.getJSONArray("data");
+
+		if (data.size()>0){
+			HstPredict hstPredict = data.getJSONObject(0).toJavaObject(HstPredict.class);
+			return hstPredict;
+
+		}else {
+			return  null;
+		}
+
 	}
 
 	@Override

--
Gitblit v1.9.3