From b6c87bcdda532d4001615a84b3e19cdfc186e98c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 六月 2025 13:04:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java
index 2552f03..0fa5004 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java
@@ -1,16 +1,26 @@
package com.iailab.module.ansteel.gas.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.iailab.module.ansteel.api.dto.PreDataViewSimpleDTO;
import com.iailab.module.ansteel.gas.dao.GasPredConfDao;
import com.iailab.module.ansteel.gas.entity.GasPredConfEntity;
import com.iailab.module.ansteel.gas.service.GasPredConfService;
+import com.iailab.module.model.api.mcs.McsApi;
+import com.iailab.module.model.api.mcs.dto.PreDataBarLineReqVO;
+import com.iailab.module.model.api.mcs.dto.PreDataBarLineRespVO;
+import com.iailab.module.model.api.mcs.dto.PreDataViewRespDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* @author dyk
@@ -23,14 +33,45 @@
@Resource
private GasPredConfDao gasPredConfDao;
+ @Autowired
+ private McsApi mcsApi;
@Override
- public List<GasPredConfEntity> list(Map<String, Object> params) {
+ public List<PreDataViewSimpleDTO> list(Map<String, Object> params) {
String chartCode = (String) params.get("chartCode");
QueryWrapper<GasPredConfEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(StringUtils.isNotBlank(chartCode), "chart_code", chartCode);
queryWrapper.orderByAsc("sort");
- return gasPredConfDao.selectList(queryWrapper);
+ List<GasPredConfEntity> gasPredConfEntities = gasPredConfDao.selectList(queryWrapper);
+ if (CollectionUtils.isEmpty(gasPredConfEntities)) {
+ return new ArrayList<>();
+ }
+ PreDataBarLineReqVO reqVO = new PreDataBarLineReqVO();
+ reqVO.setOutIds(gasPredConfEntities.stream().map(GasPredConfEntity::getOutId).collect(Collectors.toList()));
+ PreDataBarLineRespVO preDataBarLineRespVO = mcsApi.getPreDataCharts(reqVO);
+ List<PreDataViewSimpleDTO> preDataViewSimpleDTOList = new ArrayList<>();
+ Map<String, PreDataViewRespDTO> resultMap = preDataBarLineRespVO.getDataViewList().stream().collect(Collectors.toMap(PreDataViewRespDTO::getOutId, Function.identity(), (e1, e2) -> e1));
+ for (GasPredConfEntity config : gasPredConfEntities) {
+ if (resultMap.containsKey(config.getOutId())) {
+ PreDataViewRespDTO result = resultMap.get(config.getOutId());
+ PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
+ preDataViewSimpleDTO.setItemName(config.getOutName());
+ preDataViewSimpleDTO.setPredictTime(result.getPredictTime());
+ preDataViewSimpleDTO.setLineType(config.getLineType());
+
+ preDataViewSimpleDTO.setCurData(result.getCurData());
+ preDataViewSimpleDTO.setRealData(result.getRealData());
+ preDataViewSimpleDTO.setPreDataL(result.getPreDataL());
+ preDataViewSimpleDTO.setPreDataN(result.getPreDataN());
+ preDataViewSimpleDTO.setCumulantRealData(result.getCumulantRealData());
+ preDataViewSimpleDTO.setCumulantPreData(result.getCumulantPreData());
+
+ preDataViewSimpleDTOList.add(preDataViewSimpleDTO);
+ }
+ }
+
+
+ return preDataViewSimpleDTOList;
}
}
\ No newline at end of file
--
Gitblit v1.9.3