From b6c87bcdda532d4001615a84b3e19cdfc186e98c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 六月 2025 13:04:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 132 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 110 insertions(+), 22 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 9be30ca..a2f072a 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
@@ -3,16 +3,17 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.ansteel.api.dao.*;
+import com.iailab.module.ansteel.api.dao.MainProcessIndexDayDao;
+import com.iailab.module.ansteel.api.dao.MainProcessIndexTeamDao;
import com.iailab.module.ansteel.api.dto.*;
+import com.iailab.module.ansteel.api.service.DataService;
+import com.iailab.module.ansteel.common.constant.CommonConstant;
import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
import com.iailab.module.ansteel.power.dao.*;
import com.iailab.module.ansteel.power.entity.PowerCapacitorStatusEntity;
import com.iailab.module.ansteel.power.entity.PowerControlDetEntity;
import com.iailab.module.ansteel.power.entity.PowerControlMainEntity;
import com.iailab.module.ansteel.power.entity.PowerNetFactorEntity;
-import com.iailab.module.ansteel.api.service.DataService;
-import com.iailab.module.ansteel.common.constant.CommonConstant;
import com.iailab.module.data.api.ind.IndItemApi;
import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
@@ -32,9 +33,8 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
-
-import static com.iailab.framework.common.pojo.CommonResult.success;
@Slf4j
@Service
@@ -175,19 +175,36 @@
if (predictItem == null || predictItem.getLastTime() == null) {
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);
String trendsDataL = tMap.get(CommonConstant.TRENDSDATA_L) == null ? null : tMap.get(CommonConstant.TRENDSDATA_L);
+ String culIndex = tMap.get(CommonConstant.CUL_INDEX) == null ? null : tMap.get(CommonConstant.CUL_INDEX);//累计量
+ String lineType = tMap.get(CommonConstant.LINE_TYPE) == null ? null : tMap.get(CommonConstant.LINE_TYPE);
Date[] timeArray = calResultTime(predictItem, reqVO.getStartTime(), reqVO.getEndTime(), lengthLeft, lengthRight);
Date startTime = timeArray[1];
Date endTime = timeArray[2];
+ /*String timeFormat = null;
+ if (StringUtils.isNotBlank(reqVO.getTimeFormat())) {
+ timeFormat = reqVO.getTimeFormat();
+ } else if ((endTime.getTime() - startTime.getTime()) < 1000 * 60 * 60 * 24 ) {
+ // 时间范围短，默认使用短时间格式 "HH:mm"
+ timeFormat = DateUtils.FORMAT_SIMPLE_TIME;
+ } else {
+ timeFormat = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+ }*/
+ final String finalTimeFormat = timeFormat;
+ // reqVO.setTimeFormat(finalTimeFormat);
PreDataSingleChartRespVO resultOld = mcsApi.getPreDataSingleChart(reqVO);
PreDataChartRespVO result = ConvertUtils.sourceToTarget(resultOld, PreDataChartRespVO.class);
+ //result.setPredictTime(DateUtils.format(resultOld.getPredictTime(), finalTimeFormat));
PreDataViewDTO preDataView = ConvertUtils.sourceToTarget(resultOld.getDataView(), PreDataViewDTO.class);
+ //preDataView.setPredictTime(DateUtils.format(resultOld.getDataView().getPredictTime(), finalTimeFormat));
+
if (StringUtils.isNotBlank(trendsDataH)) {
// 动态上限
ApiPointValueQueryDTO pointValueQueryDTO = new ApiPointValueQueryDTO();
@@ -198,7 +215,7 @@
List<Object[]> newList = new ArrayList<>();
trendsDataHList.forEach(item -> {
Object[] dataItem = new Object[2];
- dataItem[0] = item.getT();
+ dataItem[0] = DateUtils.format(item.getT(), finalTimeFormat);
dataItem[1] = item.getV();
newList.add(dataItem);
});
@@ -214,14 +231,36 @@
List<Object[]> newList = new ArrayList<>();
trendsDataLList.forEach(item -> {
Object[] dataItem = new Object[2];
- dataItem[0] = item.getT();
+ dataItem[0] = DateUtils.format(item.getT(), finalTimeFormat);
dataItem[1] = item.getV();
newList.add(dataItem);
});
preDataView.setTrendsDataL(newList);
}
- preDataView.setPreData(resultOld.getDataView().getPreDataL());
+ List<Object[]> culData = new ArrayList<>();
+ double leiji = 0;
+ if (StringUtils.isNotBlank(culIndex) && !CollectionUtils.isEmpty(preDataView.getCurData())) {
+ for (int i = 0; i < preDataView.getCurData().size(); i++) {
+ Object[] item = preDataView.getCurData().get(i);
+ Object[] dataItem = new Object[2];
+ dataItem[0] = item[0];
+ leiji = leiji + new BigDecimal(item[1].toString()).doubleValue();
+ dataItem[1] = new BigDecimal(leiji).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP);
+ culData.add(dataItem);
+ }
+ }
+ preDataView.setCulData(culData);
+ switch (lineType) {
+ case "0":
+ preDataView.setPreData(resultOld.getDataView().getPreDataN());
+ break;
+ case "1":
+ preDataView.setPreData(resultOld.getDataView().getPreDataL());
+ break;
+ default:
+ break;
+ }
result.setPreDataView(preDataView);
return result;
}
@@ -285,10 +324,13 @@
// 修正计划数据
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);
+ result.put("predictTime", DateUtils.format(predictTime, "yyyy-MM-dd HH:mm:00"));
+ result.put("startTime", DateUtils.format(startTime, "yyyy-MM-dd HH:mm:00"));
+ result.put("endTime", DateUtils.format(endTime, "yyyy-MM-dd HH:mm:00"));
return result;
}
@@ -305,7 +347,11 @@
if (!CollectionUtils.isEmpty(value)) {
value.forEach(item -> {
String[] ri = new String[3];
- ri[0] = DateUtils.format(DateUtils.parse(item.getStartTime(), DateUtils.DATE_TIME_PATTERN_STRING), "yyyy-MM-dd HH:mm:00");
+ if(DateUtils.parse(item.getStartTime(), DateUtils.DATE_TIME_PATTERN_STRING).getTime() < startTime.getTime()){
+ ri[0] = DateUtils.format(startTime, "yyyy-MM-dd HH:mm:00");
+ }else {
+ ri[0] = DateUtils.format(DateUtils.parse(item.getStartTime(), DateUtils.DATE_TIME_PATTERN_STRING), "yyyy-MM-dd HH:mm:00");
+ }
ri[1] = DateUtils.format(DateUtils.parse(item.getEndTime(), DateUtils.DATE_TIME_PATTERN_STRING), "yyyy-MM-dd HH:mm:00");
ri[2] = "2";
if (DateUtils.parse(item.getStartTime(), "yyyyMMddHHmmss").getTime() < predictTime.getTime()) {
@@ -320,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);
}
@@ -347,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];
@@ -447,15 +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);
+
List<PreDataViewSimpleDTO> preDataViewSimpleDTOList = new ArrayList<>();
preDataBarLineRespVO.getDataViewList().forEach(item -> {
PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
- preDataViewSimpleDTO.setItemName(item.getItemName());
- preDataViewSimpleDTO.setItemId(item.getItemId());
- preDataViewSimpleDTO.setOutId(item.getOutId());
- preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());
+ preDataViewSimpleDTO.setItemName(item.getResultName());
+ preDataViewSimpleDTO.setPredictTime(item.getPredictTime());
+
preDataViewSimpleDTO.setCurData(item.getCurData());
preDataViewSimpleDTO.setRealData(item.getRealData());
+ 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