From b7c3fc85eba070a5c6625bc680ae9993d5553fae Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 12 Mar 2024 16:25:56 +0800
Subject: [PATCH] hst预测定时器启用多线程请求
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HstPredictServiceImpl.java | 246 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 203 insertions(+), 43 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 c79276c..5a60f5c 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
@@ -7,12 +7,15 @@
import cn.gistack.nky.requestpojo.PredictWatersPo;
import cn.gistack.nky.requestpojo.QueryReqPo;
import cn.gistack.nky.resultpojo.DataResChildrenPo;
+import cn.gistack.nky.resultpojo.NewSwFuturePo;
import cn.gistack.nky.service.IHstPredictService;
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 lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,20 +26,25 @@
import java.util.stream.Collectors;
@Service
+@Slf4j
public class HstPredictServiceImpl extends ServiceImpl<HstPredictMapper, HstPredict> implements IHstPredictService {
@Autowired
- private INkyService nkyService;
+ private INkyService nkyService;
@Autowired
- private IZtApiService ztApiService;
+ private IZtApiService ztApiService;
@Autowired
- private IHsybService hsybService;
+ private IHsybService hsybService;
@Override
public void getData(String type) {
List<DataResChildrenPo> cdList = getCdList(type);
- List<DataResChildrenPo> collect = cdList.stream().filter(item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42128140006")).collect(Collectors.toList());
- collect.forEach(dataResChildrenPo -> {
+// List<DataResChildrenPo> collect = cdList.stream().filter(
+//// item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42128140006")
+// item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42130350046")|| item.getRes_cd().equals("42092250024")|| item.getRes_cd().equals("42022250039")|| item.getRes_cd().equals("42132150292")
+//
+// ).collect(Collectors.toList());
+ cdList.forEach(dataResChildrenPo -> {
//循环请求预测结果
QueryReqPo queryReqPo = new QueryReqPo(dataResChildrenPo, type);
//请求预测结果
@@ -48,80 +56,231 @@
});
}
- private String resCd = "";
+// private String resCd = "";
@Override
public void predictData(String type) {
List<DataResChildrenPo> cdList = getCdList(type);
- //暂时筛选出这两个水库的数据
- List<DataResChildrenPo> collect = cdList.stream().filter(item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42128140006")).collect(Collectors.toList());
+ //暂时筛选出数据
+// List<DataResChildrenPo> collect = cdList.stream().filter(
+//// item -> item.getRes_cd().equals("42011640018") || item.getRes_cd().equals("42130350046")|| item.getRes_cd().equals("42092250024")|| item.getRes_cd().equals("42022250039")|| item.getRes_cd().equals("42132150292")
+// item -> item.getRes_cd().equals("42050659003") ||item.getRes_cd().equals("42032240005")
+// ).collect(Collectors.toList());
+
+// predict(collect,type);
+
+ newPredict(cdList,type);
- if (type.equals("1")){
- //渗压
- collect.forEach(dataResChildrenPo -> {
- //所有水库请求预报数据
- if (!resCd.equals(dataResChildrenPo.getRes_cd())) {
- //请求预报水位
- List<List<String>> future = hsybService.getFuture(dataResChildrenPo.getRes_cd());
- resCd = dataResChildrenPo.getRes_cd();
+ }
+
+ private void newPredict(List<DataResChildrenPo> collect, String type) {
+
+ String resCd = "";
+ //无数据直接返回
+ if (collect.size() == 0){
+ return;
+ }
+ int no = 0;
+ List<NewSwFuturePo> future = new ArrayList<>();
+ if (type.equals("1") || type.equals("2")){
+
+ for (int i = 0; i < collect.size(); i++) {
+ DataResChildrenPo dataResChildrenPo = collect.get(i);
+ String currentResCd = dataResChildrenPo.getRes_cd();
+
+ try {
+ //第一个水库
+ if (future.size() == 0 && resCd.equals("")){
+ future = hsybService.getNewFuture(currentResCd);
+ //当前水库
+ resCd = currentResCd;
+ no = no +1;
+ log.info("当前为第{}个水库，水库id为{}",no,currentResCd);
+ } else if (!resCd.equals(currentResCd)) {
+ //其他水库，获取新的预测数据
+ future = hsybService.getNewFuture(currentResCd);
+ //更换为新水库
+ resCd = currentResCd;
+ no = no +1;
+ log.info("当前为第{}个水库，水库id为{}",no,currentResCd);
+ }
+
+ //预测数据构造请求数据
if (future != null && future.size() > 0) {
List<PredictWatersPo> po = new ArrayList<>();
future.forEach(item -> {
PredictWatersPo predictWatersPo = new PredictWatersPo();
//设置时间
- predictWatersPo.setTime(item.get(0));
+ predictWatersPo.setTime(item.getTime());
//设置预测水位
- predictWatersPo.setValue(Double.parseDouble(item.get(2)));
+ predictWatersPo.setValue(Double.parseDouble(item.getSw()));
po.add(predictWatersPo);
});
- HstPredictReqPo arimaPredictReqPo = new HstPredictReqPo(dataResChildrenPo, type,po);
+ HstPredictReqPo arimaPredictReqPo = new HstPredictReqPo(dataResChildrenPo, type, po);
//循环预测请求
nkyService.hstPredict(arimaPredictReqPo);
}
+ }catch (Exception e){
+ e.printStackTrace();
}
- });
- }else if (type.equals("2")){
- //渗流
+ }
}else if (type.equals("3") || type.equals("4") || type.equals("5")){
- collect.forEach(dataResChildrenPo -> {
- //所有水库请求预报数据
- if (!resCd.equals(dataResChildrenPo.getRes_cd())) {
- //请求预报水位
- List<List<String>> future = hsybService.getFuture(dataResChildrenPo.getRes_cd());
- resCd = dataResChildrenPo.getRes_cd();
+
+ for (int i = 0; i < collect.size(); i++) {
+ DataResChildrenPo dataResChildrenPo = collect.get(i);
+ String currentResCd = dataResChildrenPo.getRes_cd();
+
+ try {
+ //第一个水库
+ if (future.size() == 0 && resCd.equals("")){
+ future = hsybService.getNewFuture(currentResCd);
+ //当前水库
+ resCd = currentResCd;
+ no = no +1;
+ log.info("当前为第{}个水库，水库id为{}",no,currentResCd);
+ } else if (!resCd.equals(currentResCd)) {
+ //其他水库，获取新的预测数据
+ future = hsybService.getNewFuture(currentResCd);
+ //更换为新水库
+ resCd = currentResCd;
+ no = no +1;
+ log.info("当前为第{}个水库，水库id为{}",no,currentResCd);
+ }
+
+ //预测数据构造请求数据
if (future != null && future.size() > 0) {
List<PredictWatersPo> po = new ArrayList<>();
future.forEach(item -> {
PredictWatersPo predictWatersPo = new PredictWatersPo();
//设置时间
- predictWatersPo.setTime(item.get(0));
+ predictWatersPo.setTime(item.getTime());
//设置预测水位
- predictWatersPo.setValue(Double.parseDouble(item.get(2)));
+ predictWatersPo.setValue(Double.parseDouble(item.getSw()));
po.add(predictWatersPo);
});
//循环预测请求(位移一起请求减少请求次数)
- HstPredictReqPo arimaPredictReqPoX = new HstPredictReqPo(dataResChildrenPo, "3",po);
+ HstPredictReqPo arimaPredictReqPoX = new HstPredictReqPo(dataResChildrenPo, "3", po);
nkyService.hstPredict(arimaPredictReqPoX);
- HstPredictReqPo arimaPredictReqPoY= new HstPredictReqPo(dataResChildrenPo, "4",po);
+ HstPredictReqPo arimaPredictReqPoY = new HstPredictReqPo(dataResChildrenPo, "4", po);
nkyService.hstPredict(arimaPredictReqPoY);
- HstPredictReqPo arimaPredictReqPoZ = new HstPredictReqPo(dataResChildrenPo, "5",po);
+ HstPredictReqPo arimaPredictReqPoZ = new HstPredictReqPo(dataResChildrenPo, "5", po);
nkyService.hstPredict(arimaPredictReqPoZ);
}
+ }catch (Exception e){
+ e.printStackTrace();
}
- });
+
+
+ }
}
- resCd = "";
+
+ }
+
+ private void predict(List<DataResChildrenPo> collect, String type) {
+ String resCd = "";
+ //无数据直接返回
+ if (collect.size() == 0){
+ return;
+ }
+ List<List<String>> future = new ArrayList<>();
+ if (type.equals("1") || type.equals("2")){
+
+ for (int i = 0; i < collect.size(); i++) {
+ DataResChildrenPo dataResChildrenPo = collect.get(i);
+ String currentResCd = dataResChildrenPo.getRes_cd();
+
+ //第一个水库
+ if (future.size() == 0 && resCd.equals("")){
+ future = hsybService.getFuture(currentResCd);
+ //当前水库
+ resCd = currentResCd;
+ } else if (!resCd.equals(currentResCd)) {
+ //其他水库，获取新的预测数据
+ future = hsybService.getFuture(currentResCd);
+ //更换为新水库
+ resCd = currentResCd;
+ }
+
+ //预测数据构造请求数据
+ if (future != null && future.size() > 0) {
+ List<PredictWatersPo> po = new ArrayList<>();
+ future.forEach(item -> {
+ PredictWatersPo predictWatersPo = new PredictWatersPo();
+ //设置时间
+ predictWatersPo.setTime(item.get(0));
+ //设置预测水位
+ predictWatersPo.setValue(Double.parseDouble(item.get(2)));
+ po.add(predictWatersPo);
+ });
+ HstPredictReqPo arimaPredictReqPo = new HstPredictReqPo(dataResChildrenPo, type, po);
+ //循环预测请求
+ nkyService.hstPredict(arimaPredictReqPo);
+ }
+
+
+ }
+ }else if (type.equals("3") || type.equals("4") || type.equals("5")){
+
+ for (int i = 0; i < collect.size(); i++) {
+ DataResChildrenPo dataResChildrenPo = collect.get(i);
+ String currentResCd = dataResChildrenPo.getRes_cd();
+
+ //第一个水库
+ if (future.size() == 0 && resCd.equals("")){
+ future = hsybService.getFuture(currentResCd);
+ //当前水库
+ resCd = currentResCd;
+ } else if (!resCd.equals(currentResCd)) {
+ //其他水库，获取新的预测数据
+ future = hsybService.getFuture(currentResCd);
+ //更换为新水库
+ resCd = currentResCd;
+ }
+
+ //预测数据构造请求数据
+ if (future != null && future.size() > 0) {
+ List<PredictWatersPo> po = new ArrayList<>();
+ future.forEach(item -> {
+ PredictWatersPo predictWatersPo = new PredictWatersPo();
+ //设置时间
+ predictWatersPo.setTime(item.get(0));
+ //设置预测水位
+ predictWatersPo.setValue(Double.parseDouble(item.get(2)));
+ po.add(predictWatersPo);
+ });
+ //循环预测请求(位移一起请求减少请求次数)
+ HstPredictReqPo arimaPredictReqPoX = new HstPredictReqPo(dataResChildrenPo, "3", po);
+ nkyService.hstPredict(arimaPredictReqPoX);
+
+ HstPredictReqPo arimaPredictReqPoY = new HstPredictReqPo(dataResChildrenPo, "4", po);
+ nkyService.hstPredict(arimaPredictReqPoY);
+
+ HstPredictReqPo arimaPredictReqPoZ = new HstPredictReqPo(dataResChildrenPo, "5", po);
+ nkyService.hstPredict(arimaPredictReqPoZ);
+ }
+ }
+ }
}
@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 -> {
- hstPredict.setPredictList(JSON.parse(hstPredict.getPredictList().toString()));
+ if (hstPredict.getPredictList() != null) {
+ hstPredict.setPredictList(JSON.parse(hstPredict.getPredictList().toString()));
+ } else {
+ hstPredict.setPredictList("[]");
+ }
hstPredict.setPreWaterList(JSON.parse(hstPredict.getPreWaterList().toString()));
});
@@ -137,11 +296,12 @@
List<HstPredict> list = baseMapper.selectTodayData(entity);
- if (list.size()>0){
+ if (list.size() > 0) {
//删除该数据，添加最新数据
- baseMapper.deleteById(list.get(0));
- return super.save(entity);
- }else {
+// baseMapper.deleteById(list.get(0));
+// return super.save(entity);
+ return false;
+ } else {
return super.save(entity);
}
}
@@ -153,7 +313,7 @@
cdList = ztApiService.getSy();
} else if (type.equals("2")) {
//获取渗流测点
- return null;
+ cdList = ztApiService.getSl();
} else if (type.equals("3") || type.equals("4") || type.equals("5")) {
//获取位移测点
cdList = ztApiService.getWy();
--
Gitblit v1.9.3