From 42cc9b6968364c7c1e6149ffc89996db073d9965 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 19 六月 2025 08:36:39 +0800
Subject: [PATCH] 折线图时间格式化
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 a94fd15..efd7117 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
@@ -176,6 +176,7 @@
return null;
}
+ String timeFormat = StringUtils.isBlank(reqVO.getTimeFormat()) ? DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND : reqVO.getTimeFormat();
int lengthLeft = tMap.get(CommonConstant.LENGTH_LEFT) == null ? predictItem.getPredictLength() : new BigDecimal(tMap.get(CommonConstant.LENGTH_LEFT)).intValue();
int lengthRight = tMap.get(CommonConstant.LENGTH_RIGHT) == null ? predictItem.getPredictLength() : new BigDecimal(tMap.get(CommonConstant.LENGTH_RIGHT)).intValue();
String trendsDataH = tMap.get(CommonConstant.TRENDSDATA_H) == null ? null : tMap.get(CommonConstant.TRENDSDATA_H);
@@ -186,7 +187,7 @@
Date[] timeArray = calResultTime(predictItem, reqVO.getStartTime(), reqVO.getEndTime(), lengthLeft, lengthRight);
Date startTime = timeArray[1];
Date endTime = timeArray[2];
- String timeFormat = null;
+ /*String timeFormat = null;
if (StringUtils.isNotBlank(reqVO.getTimeFormat())) {
timeFormat = reqVO.getTimeFormat();
} else if ((endTime.getTime() - startTime.getTime()) < 1000 * 60 * 60 * 24 ) {
@@ -194,15 +195,15 @@
timeFormat = DateUtils.FORMAT_SIMPLE_TIME;
} else {
timeFormat = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
- }
+ }*/
final String finalTimeFormat = timeFormat;
- reqVO.setTimeFormat(finalTimeFormat);
+ // reqVO.setTimeFormat(finalTimeFormat);
PreDataSingleChartRespVO resultOld = mcsApi.getPreDataSingleChart(reqVO);
PreDataChartRespVO result = ConvertUtils.sourceToTarget(resultOld, PreDataChartRespVO.class);
- result.setPredictTime(DateUtils.format(resultOld.getPredictTime(), finalTimeFormat));
+ //result.setPredictTime(DateUtils.format(resultOld.getPredictTime(), finalTimeFormat));
PreDataViewDTO preDataView = ConvertUtils.sourceToTarget(resultOld.getDataView(), PreDataViewDTO.class);
- preDataView.setPredictTime(DateUtils.format(resultOld.getDataView().getPredictTime(), finalTimeFormat));
+ //preDataView.setPredictTime(DateUtils.format(resultOld.getDataView().getPredictTime(), finalTimeFormat));
if (StringUtils.isNotBlank(trendsDataH)) {
// 动态上限
@@ -498,7 +499,7 @@
preDataBarLineRespVO.getDataViewList().forEach(item -> {
PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
preDataViewSimpleDTO.setItemName(item.getResultName());
- preDataViewSimpleDTO.setPredictTime(predictTime);
+ preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());
preDataViewSimpleDTO.setCurData(item.getCurData());
preDataViewSimpleDTO.setRealData(item.getRealData());
preDataViewSimpleDTO.setPreDataN(item.getPreDataN().stream()
--
Gitblit v1.9.3