From 9a7ca006083925941d0b1537944abd6cfe236405 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 16 Dec 2024 15:35:37 +0800
Subject: [PATCH] 大坝安全监测监测回调调整,监测查询调整新的数据表

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/ArimaPredictServiceImpl.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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..6a19246 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,6 +11,7 @@
 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.springblade.core.mp.support.Condition;
@@ -84,14 +85,17 @@
 		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()));
-		});
+//		futureData.forEach(arimaPredict -> {
+//			arimaPredict.setValue(JSON.parse(arimaPredict.getValue()).toString());
+//			arimaPredict.setPredicts(JSON.parse(arimaPredict.getPredicts().toString()));
+//		});
 		return futureData;
 	}
 

--
Gitblit v1.9.3