From 00165e5d50f47c99d9eb7c2fc784bef4d3f72aca Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 16 Nov 2023 15:05:24 +0800
Subject: [PATCH] 预测返回测站名称

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

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 5a59e6d..d79431d 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
@@ -9,6 +9,7 @@
 import cn.gistack.nky.service.IArimaPredictService;
 import cn.gistack.nky.service.INkyService;
 import cn.gistack.nky.service.IZtApiService;
+import cn.gistack.nky.vo.ArimaPredictVO;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
@@ -79,8 +80,15 @@
 	}
 
 	@Override
-	public List<ArimaPredict> getFutureData(String resCd,String type) {
-		List<ArimaPredict> futureData = baseMapper.getFutureData(resCd, type);
+	public List<ArimaPredictVO> getFutureData(String resCd, String type) {
+		List<ArimaPredictVO> futureData = new ArrayList<>();
+		if (type.equals("3")){
+			//位移另一张表
+			futureData=baseMapper.getFutureDataWy(resCd,type);
+		}else{
+			 futureData = baseMapper.getFutureData(resCd, type);
+		}
+
 		futureData.forEach(arimaPredict -> {
 			arimaPredict.setPredicts(JSON.parse(arimaPredict.getPredicts().toString()));
 		});

--
Gitblit v1.9.3