From d338b50afd6504a9676f0a26b3ecbcc844483e7c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 21 十一月 2024 08:57:08 +0800
Subject: [PATCH] 并发采集
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 139 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 131 insertions(+), 8 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index 623c97d..b358b99 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -7,11 +7,15 @@
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.*;
+import com.iailab.module.model.common.enums.CommonConstant;
+import com.iailab.module.model.common.enums.PreLineTypeEnum;
import com.iailab.module.model.mcs.pre.entity.DmModuleEntity;
import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.pre.service.*;
import com.iailab.module.model.mdk.vo.ItemVO;
+import com.iailab.module.model.mpk.service.ChartService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
@@ -19,6 +23,7 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author PanZhibao
@@ -47,6 +52,12 @@
@Autowired
private DataPointApi dataPointApi;
+
+ @Autowired
+ private MmItemResultJsonService mmItemResultJsonService;
+
+ @Autowired
+ private ChartService chartService;
private int HOUR_MINS = 60;
@@ -136,8 +147,8 @@
viewDto.setOutId(outId);
viewDto.setResultstr(output.getResultstr());
viewDto.setRealData(getHisData(output.getPointid(), startTime, endTime));
- viewDto.setPreDataN(mmItemResultService.getData(output.getId(), startTime, endTime));
- viewDto.setPreDataL(mmItemResultLastPointService.getData(output.getId(), startTime, endTime));
+ viewDto.setPreDataN(mmItemResultService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ viewDto.setPreDataL(mmItemResultLastPointService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
List<Double> values = new ArrayList<>();
if (!CollectionUtils.isEmpty(viewDto.getRealData())) {
@@ -211,20 +222,20 @@
if (startTime == null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictItem.getLastTime());
- calendar.add(Calendar.HOUR_OF_DAY, -1);
+ calendar.add(Calendar.MINUTE, -1 * predictItem.getPredictLength());
startTime = calendar.getTime();
}
Date endTime = reqVO.getEndTime();
if (endTime == null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictItem.getLastTime());
- calendar.add(Calendar.HOUR_OF_DAY, 1);
+ calendar.add(Calendar.MINUTE, predictItem.getPredictLength());
endTime = calendar.getTime();
}
if (endTime.getTime() <= startTime.getTime()) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(startTime);
- calendar.add(Calendar.HOUR_OF_DAY, 1);
+ calendar.add(Calendar.MINUTE, predictItem.getPredictLength());
endTime = calendar.getTime();
}
@@ -239,7 +250,7 @@
legend.add(out.getResultstr());
PreDataSampleViewRespDTO viewDto = new PreDataSampleViewRespDTO();
viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime));
- viewDto.setPreDataN(mmItemResultService.getData(out.getId(), startTime, endTime));
+ viewDto.setPreDataN(mmItemResultService.getData(out.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
viewMap.put(out.getResultstr(), viewDto);
}
result.setStartTime(startTime);
@@ -251,10 +262,93 @@
}
@Override
- public PreDataItemChartRespVO getPreDataSingleChart(PreDataSingleChartReqVO reqVO) {
- PreDataItemChartRespVO result = new PreDataItemChartRespVO();
+ public PreDataSingleChartRespVO getPreDataSingleChart(PreDataSingleChartReqVO reqVO) {
+ PreDataSingleChartRespVO result = new PreDataSingleChartRespVO();
+ Map<String, String> chartParams = chartService.getByChartCode(reqVO.getChartCode());
+ if (CollectionUtils.isEmpty(chartParams)) {
+ return result;
+ }
+ String itemCode = chartParams.get(CommonConstant.ITEM_CODE);
+ if (itemCode == null) {
+ return result;
+ }
+ String resultStr = chartParams.get(CommonConstant.RESULT_STR);
+ if (resultStr == null) {
+ return result;
+ }
+ ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemCode);
+ if (predictItem == null || predictItem.getLastTime() == null) {
+ return result;
+ }
+ String timeFormat = StringUtils.isBlank(reqVO.getTimeFormat()) ? DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND : reqVO.getTimeFormat();
+ PreLineTypeEnum lineType = chartParams.get(CommonConstant.LINE_TYPE) == null ? PreLineTypeEnum.TN : PreLineTypeEnum.getEumByCode(chartParams.get(CommonConstant.LINE_TYPE));
+ BigDecimal rangeH = chartParams.get(CommonConstant.RANGE_H) == null ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.RANGE_H));
+ BigDecimal rangeL = chartParams.get(CommonConstant.RANGE_L) == null ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.RANGE_L));
+ BigDecimal limitH = chartParams.get(CommonConstant.LIMIT_H) == null ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.LIMIT_H));
+ BigDecimal limitL = chartParams.get(CommonConstant.LIMIT_L) == null ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.LIMIT_L));
+ int lengthLeft = chartParams.get(CommonConstant.LENGTH_LEFT) == null ? predictItem.getPredictLength() : new BigDecimal(chartParams.get(CommonConstant.LENGTH_LEFT)).intValue();
+ int lengthRight = chartParams.get(CommonConstant.LENGTH_RIGHT) == null ? predictItem.getPredictLength() : new BigDecimal(chartParams.get(CommonConstant.LENGTH_RIGHT)).intValue();
+ result.setPredictTime(predictItem.getLastTime());
+ Date predictTime = predictItem.getLastTime();
+ Date startTime = reqVO.getStartTime();
+ if (startTime == null) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(predictItem.getLastTime());
+ calendar.add(Calendar.MINUTE, -1 * lengthLeft);
+ startTime = calendar.getTime();
+ }
+ Date endTime = reqVO.getEndTime();
+ if (endTime == null) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(predictItem.getLastTime());
+ calendar.add(Calendar.MINUTE, lengthRight);
+ endTime = calendar.getTime();
+ }
+ if (endTime.getTime() <= startTime.getTime()) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(startTime);
+ calendar.add(Calendar.MINUTE, lengthRight);
+ endTime = calendar.getTime();
+ }
+ List<String> categories = DateUtils.getTimeScale(startTime, endTime, predictItem.getGranularity(), timeFormat);
+ List<String> legend = new ArrayList<>();
+ MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), resultStr);
+ PreDataViewRespDTO dataView = new PreDataViewRespDTO();
+ dataView.setItemId(predictItem.getId());
+ dataView.setItemName(predictItem.getItemName());
+ dataView.setResultstr(resultStr);
+ dataView.setRangeH(rangeH);
+ dataView.setRangeL(rangeL);
+ dataView.setLimitH(limitH);
+ dataView.setLimitL(limitL);
+ dataView.setRealData(getHisData(outPut.getPointid(), startTime, endTime, timeFormat));
+ dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat));
+ switch (lineType) {
+ case TN:
+ dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), startTime, endTime, timeFormat));
+ break;
+ case TL:
+ dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), predictTime, endTime, timeFormat));
+ dataView.setPreDataL(mmItemResultLastPointService.getData(outPut.getId(), startTime, endTime, timeFormat));
+ break;
+ default:
+ break;
+ }
+ if (!CollectionUtils.isEmpty(dataView.getCurData())) {
+ List<Double> curList = dataView.getCurData().stream().map(t -> {
+ return new Double(t[1].toString());
+ }).collect(Collectors.toList());
+ dataView.setPreMax(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).max().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
+ dataView.setPreMin(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
+ }
+
+ result.setStartTime(startTime);
+ result.setEndTime(endTime);
+ result.setCategories(categories);
+ result.setLegend(legend);
+ result.setDataView(dataView);
return result;
}
@@ -286,6 +380,35 @@
return result;
}
+ /**
+ * 获取真实值
+ *
+ * @param pointId
+ * @param startTime
+ * @param endTime
+ * @param timeFormat
+ * @return
+ */
+ private List<Object[]> getHisData(String pointId, Date startTime, Date endTime, String timeFormat) {
+ List<Object[]> result = new ArrayList<>();
+ ApiPointDTO pointDTO = dataPointApi.getInfoById(pointId);
+ ApiPointValueQueryDTO queryPointDto = new ApiPointValueQueryDTO();
+ queryPointDto.setPointNo(pointDTO.getPointNo());
+ queryPointDto.setStart(startTime);
+ queryPointDto.setEnd(endTime);
+ List<ApiPointValueDTO> valueDTOS = dataPointApi.queryPointHistoryValue(queryPointDto);
+ if (CollectionUtils.isEmpty(valueDTOS)) {
+ return result;
+ }
+ valueDTOS.forEach(item -> {
+ Object[] values = new Object[2];
+ values[0] = DateUtils.format(item.getT(), timeFormat);
+ values[1] = new BigDecimal(item.getV()).setScale(2, BigDecimal.ROUND_HALF_UP);
+ result.add(values);
+ });
+ return result;
+ }
+
@Override
public Boolean createAlarmMessage(AlarmMessageRespDTO dto) {
return true;
--
Gitblit v1.9.3