From 1b316e12ad2694a77f1ea45f3214fcfb90c45393 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 20 Dec 2024 15:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ArimaPredictServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 d79431d..3e9bd67 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
@@ -11,8 +11,10 @@
import cn.gistack.nky.service.IZtApiService;
import cn.gistack.nky.vo.ArimaPredictVO;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.ObjectUtil;
@@ -84,13 +86,18 @@
List<ArimaPredictVO> futureData = new ArrayList<>();
if (type.equals("3")){
//位移另一张表
- futureData=baseMapper.getFutureDataWy(resCd,type);
+// futureData=baseMapper.getFutureDataWy(resCd,type);
+ futureData=baseMapper.getFutureDataWy2(resCd,type);
}else{
- futureData = baseMapper.getFutureData(resCd, type);
+// futureData = baseMapper.getFutureData(resCd, type);
+ futureData = baseMapper.getFutureData2(resCd, type);
}
futureData.forEach(arimaPredict -> {
- arimaPredict.setPredicts(JSON.parse(arimaPredict.getPredicts().toString()));
+// arimaPredict.setValue(JSON.parse(arimaPredict.getValue()).toString());
+ if (!Strings.isBlank(arimaPredict.getValue())) {
+ arimaPredict.setPredicts(JSON.parse(arimaPredict.getValue()));
+ }
});
return futureData;
}
--
Gitblit v1.9.3