From 2bdbda70e87188f4a398f5cf03e997fcaec150f4 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 07 五月 2025 15:04:17 +0800
Subject: [PATCH] 根据outId查询预测数据
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 f97d907..9be30ca 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
@@ -400,14 +400,14 @@
calendar.set(Calendar.MILLISECOND, 0);
if (!params.containsKey("endTime") || StringUtils.isBlank(params.get("endTime").toString())) {
endTime = calendar.getTime();
- }else {
- endTime = DateUtils.parse(params.get("endTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ } else {
+ endTime = DateUtils.parse(params.get("endTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
}
if (!params.containsKey("startTime") || StringUtils.isBlank(params.get("startTime").toString())) {
calendar.add(Calendar.DAY_OF_YEAR, -1);
startTime = calendar.getTime();
- }else {
- startTime = DateUtils.parse(params.get("startTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ } else {
+ startTime = DateUtils.parse(params.get("startTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
}
switch (ProcessConfDataTypeEnum.getEumByCode(dataType)) {
@@ -445,16 +445,19 @@
}
@Override
- public List<PreDataViewDTO> getPreDataByOutIds(PreDataBarLineReqVO reqVO) {
+ public List<PreDataViewSimpleDTO> getPreDataByOutIds(PreDataBarLineReqVO reqVO) {
PreDataBarLineRespVO preDataBarLineRespVO = mcsApi.getPreDataCharts(reqVO);
- List<PreDataViewDTO> preDataViewDTOList = new ArrayList<>();
+ List<PreDataViewSimpleDTO> preDataViewSimpleDTOList = new ArrayList<>();
preDataBarLineRespVO.getDataViewList().forEach(item -> {
- PreDataViewDTO dataViewDTO = new PreDataViewDTO();
- dataViewDTO.setCurData(item.getCurData());
- dataViewDTO.setRealData(item.getRealData());
- dataViewDTO.setPredictTime(item.getPredictTime());
- preDataViewDTOList.add(dataViewDTO);
+ PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
+ preDataViewSimpleDTO.setItemName(item.getItemName());
+ preDataViewSimpleDTO.setItemId(item.getItemId());
+ preDataViewSimpleDTO.setOutId(item.getOutId());
+ preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());
+ preDataViewSimpleDTO.setCurData(item.getCurData());
+ preDataViewSimpleDTO.setRealData(item.getRealData());
+ preDataViewSimpleDTOList.add(preDataViewSimpleDTO);
});
- return preDataViewDTOList;
+ return preDataViewSimpleDTOList;
}
}
\ No newline at end of file
--
Gitblit v1.9.3