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/HstPredictServiceImpl.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/HstPredictServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HstPredictServiceImpl.java
index eb2c71a..e57dc68 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
@@ -11,6 +11,7 @@
import cn.gistack.nky.service.IHsybService;
import cn.gistack.nky.service.INkyService;
import cn.gistack.nky.service.IZtApiService;
+import cn.gistack.nky.vo.HstPredictVO;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.support.Condition;
@@ -142,9 +143,15 @@
}
@Override
- public List<HstPredict> getFutureData(String resCd, String type) {
+ public List<HstPredictVO> getFutureData(String resCd, String type) {
+ List<HstPredictVO> list = new ArrayList<>();
+ if (type.equals("3")){
+ list = baseMapper.getFutureDataWy(resCd,type);
+ }else {
+ list = baseMapper.getFutureData(resCd,type);
+ }
- List<HstPredict> list = baseMapper.getFutureData(resCd,type);
+
list.forEach(hstPredict -> {
if (hstPredict.getPredictList() != null){
hstPredict.setPredictList(JSON.parse(hstPredict.getPredictList().toString()));
--
Gitblit v1.9.3