From 62696f3297b6d740f89f7a318eb1af0c7d6b7158 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 07 五月 2025 16:09:56 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 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 03d7f3a..7b41ea8 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)) {
@@ -443,4 +443,19 @@
}
return dataList;
}
+
+ @Override
+ public List<PreDataViewSimpleDTO> getPreDataByOutIds(PreDataBarLineReqVO reqVO) {
+ PreDataBarLineRespVO preDataBarLineRespVO = mcsApi.getPreDataCharts(reqVO);
+ 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());
+ preDataViewSimpleDTOList.add(preDataViewSimpleDTO);
+ });
+ return preDataViewSimpleDTOList;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3