From 3c096d3cfd56a23e6794f30ccd150bfe19aa4ae8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 11 Aug 2023 14:27:25 +0800
Subject: [PATCH] arima预测和hst预测更新最新数据;对预报水位去重

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HstPredictServiceImpl.java |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 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 c1bd73b..c79276c 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
@@ -1,5 +1,6 @@
 package cn.gistack.nky.service.impl;
 
+import cn.gistack.nky.entity.ArimaPredict;
 import cn.gistack.nky.entity.HstPredict;
 import cn.gistack.nky.mapper.HstPredictMapper;
 import cn.gistack.nky.requestpojo.HstPredictReqPo;
@@ -10,6 +11,7 @@
 import cn.gistack.nky.service.IHsybService;
 import cn.gistack.nky.service.INkyService;
 import cn.gistack.nky.service.IZtApiService;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -115,23 +117,31 @@
 	}
 
 	@Override
+	public List<HstPredict> getFutureData(String resCd, String type) {
+
+		List<HstPredict> list = baseMapper.getFutureData(resCd,type);
+		list.forEach(hstPredict -> {
+			hstPredict.setPredictList(JSON.parse(hstPredict.getPredictList().toString()));
+			hstPredict.setPreWaterList(JSON.parse(hstPredict.getPreWaterList().toString()));
+		});
+
+		return list;
+	}
+
+	@Override
 	public boolean save(HstPredict entity) {
 
 		if (ObjectUtil.isEmpty(entity.getCreateTime())) {
 			return false;
 		}
 
-		HstPredict params = new HstPredict();
-		params.setDamId(entity.getDamId());
-		params.setPointId(entity.getPointId());
-		params.setType(entity.getType());
-		params.setCreateTime(entity.getCreateTime());
+		List<HstPredict> list = baseMapper.selectTodayData(entity);
 
-		List<HstPredict> list = list(Condition.getQueryWrapper(params));
-
-		if (list.size() > 0) {
-			return false;
-		} else {
+		if (list.size()>0){
+			//删除该数据,添加最新数据
+			baseMapper.deleteById(list.get(0));
+			return super.save(entity);
+		}else {
 			return super.save(entity);
 		}
 	}
@@ -152,4 +162,5 @@
 		}
 		return cdList;
 	}
+
 }

--
Gitblit v1.9.3