From b5c61b37a752831c6b3866fa7d6e50aefc5ef4e5 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期三, 25 六月 2025 11:11:33 +0800
Subject: [PATCH] 煤气产销预测 图表接口

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
index f63f9e1..6601abd 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
@@ -529,18 +529,21 @@
     @Override
     public List<PreDataViewSimpleDTO> getPreDataByOutIds(PreDataBarLineReqVO reqVO) {
         PreDataBarLineRespVO preDataBarLineRespVO = mcsApi.getPreDataCharts(reqVO);
-        String predictTime = DateUtils.format(preDataBarLineRespVO.getPredictTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+//        String predictTime = DateUtils.format(preDataBarLineRespVO.getPredictTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
 
         List<PreDataViewSimpleDTO> preDataViewSimpleDTOList = new ArrayList<>();
         preDataBarLineRespVO.getDataViewList().forEach(item -> {
             PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
             preDataViewSimpleDTO.setItemName(item.getResultName());
             preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());
+
             preDataViewSimpleDTO.setCurData(item.getCurData());
             preDataViewSimpleDTO.setRealData(item.getRealData());
-            preDataViewSimpleDTO.setPreDataN(item.getPreDataN().stream()
-                    .filter(data -> !(DateUtils.parse(data[0].toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)).after(preDataBarLineRespVO.getPredictTime()))
-                    .collect(Collectors.toList()));
+            preDataViewSimpleDTO.setPreDataL(item.getPreDataL());
+            preDataViewSimpleDTO.setPreDataN(item.getPreDataN());
+            preDataViewSimpleDTO.setCumulantRealData(item.getCumulantRealData());
+            preDataViewSimpleDTO.setCumulantPreData(item.getCumulantPreData());
+
             preDataViewSimpleDTOList.add(preDataViewSimpleDTO);
         });
         return preDataViewSimpleDTOList;

--
Gitblit v1.9.3