From 56c701ab19eb16ebf2f75bdd42b4ea9da1c2a733 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 25 六月 2025 14:19:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 78 +++++++++++++++++++++++++++++---------
1 files changed, 59 insertions(+), 19 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..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
@@ -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)) {
// 动态上限
@@ -323,7 +324,7 @@
// 修正计划数据
LinkedHashMap<String, List<String[]>> predData = new LinkedHashMap<>();
for (int i = 0; i < reqVO.getPlanCodes().size(); i++) {
- predData.put(reqVO.getPlanCodes().get(i), getPrePlanData(reqVO.getPlanPreds().get(i), predictTime, endTime));
+ predData.put(reqVO.getPlanCodes().get(i), getPrePlanData(reqVO.getPlanPreds().get(i), startTime, endTime, predictTime));
}
result.put("planData", planData);
result.put("predData", predData);
@@ -365,25 +366,61 @@
}
//修正计划
- public List<String[]> getPrePlanData(String charCode, Date startTime, Date endTime) {
+ public List<String[]> getPrePlanData(String charCode, Date startTime, Date endTime, Date predictTime) {
List<String[]> result = new ArrayList<>();
PreDataSingleChartReqVO queryDto = new PreDataSingleChartReqVO();
queryDto.setChartCode(charCode);
queryDto.setStartTime(startTime);
queryDto.setEndTime(endTime);
PreDataSingleChartRespVO chartData = mcsApi.getPreDataSingleChart(queryDto);
- if (CollectionUtils.isEmpty(chartData.getDataView().getPreDataN())) {
+ if (CollectionUtils.isEmpty(chartData.getDataView().getCurData())) {
return result;
+ }
+ String lineType = chartData.getDataView().getLineType();
+ List<Object[]> preData = new ArrayList<>();
+ if ("1".equals(lineType)) {
+ // 两部分组成，左侧T+L,右侧当前
+ if(!CollectionUtils.isEmpty(chartData.getDataView().getPreDataL())) {
+ for (int i = 0; i < chartData.getDataView().getPreDataL().size(); i++) {
+ Object[] dataItem = chartData.getDataView().getPreDataL().get(i);
+ Date t = DateUtils.parse(dataItem[0].toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ if (t.getTime() <= predictTime.getTime()) {
+ preData.add(dataItem);
+ }
+ }
+ }
+ if(!CollectionUtils.isEmpty(chartData.getDataView().getCurData())) {
+ for (int i = 0; i < chartData.getDataView().getCurData().size(); i++) {
+ Object[] dataItem = chartData.getDataView().getCurData().get(i);
+ preData.add(dataItem);
+ }
+ }
+ } else if ("2".equals(lineType)) {
+ // 展示当前值
+ if(!CollectionUtils.isEmpty(chartData.getDataView().getCurData())) {
+ for (int i = 0; i < chartData.getDataView().getCurData().size(); i++) {
+ Object[] dataItem = chartData.getDataView().getCurData().get(i);
+ preData.add(dataItem);
+ }
+ }
+ } else {
+ // 展示T+N
+ if(!CollectionUtils.isEmpty(chartData.getDataView().getPreDataN())) {
+ for (int i = 0; i < chartData.getDataView().getPreDataN().size(); i++) {
+ Object[] dataItem = chartData.getDataView().getPreDataN().get(i);
+ preData.add(dataItem);
+ }
+ }
}
double lastValue = 0;
- for (int i = 0; i < chartData.getDataView().getPreDataN().size(); i++) {
- Object[] dataItem = chartData.getDataView().getPreDataN().get(i);
+ for (int i = 0; i < preData.size(); i++) {
+ Object[] dataItem = preData.get(i);
double cv = new BigDecimal(dataItem[1].toString()).doubleValue();
if (cv == 1 && cv != lastValue) {
String[] sa = new String[3];
sa[0] = (String) dataItem[0];
- sa[1] = getEndTime(chartData.getDataView().getPreDataN(), i);
+ sa[1] = getEndTime(preData, i);
sa[2] = "2";
result.add(sa);
}
@@ -392,11 +429,11 @@
return result;
}
- private String getEndTime(List<Object[]> preDataN, int startIndex) {
+ private String getEndTime(List<Object[]> preData, int startIndex) {
String endTime = "";
double lastValue = 1;
- for (int i = startIndex; i < preDataN.size(); i++) {
- Object[] dataItem = preDataN.get(i);
+ for (int i = startIndex; i < preData.size(); i++) {
+ Object[] dataItem = preData.get(i);
double cv = new BigDecimal(dataItem[1].toString()).doubleValue();
if (cv == 0 && cv != lastValue) {
return (String) dataItem[0];
@@ -492,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(predictTime);
+ 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