From af5604110b6958af57b7de8fcd70acbc81de419c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 20 一月 2025 17:47:35 +0800
Subject: [PATCH] break
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java | 63 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
index e4539bf..2ddb9c6 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
@@ -1,5 +1,10 @@
package com.iailab.module.model.mdk.sample;
+import cn.hutool.core.date.DateUtil;
+import com.iailab.module.data.api.ind.IndItemApi;
+import com.iailab.module.data.api.ind.dto.ApiIndItemDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
import com.iailab.module.data.api.plan.PlanItemApi;
import com.iailab.module.data.api.plan.dto.ApiPlanItemDTO;
import com.iailab.module.data.api.point.DataPointApi;
@@ -8,8 +13,6 @@
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import com.iailab.module.data.common.ApiDataQueryDTO;
import com.iailab.module.data.common.ApiDataValueDTO;
-import com.iailab.module.model.common.enums.OutResultType;
-import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.pre.service.MmItemOutputService;
import com.iailab.module.model.mcs.pre.service.MmItemResultJsonService;
import com.iailab.module.model.mcs.pre.service.MmItemResultService;
@@ -21,7 +24,6 @@
import com.iailab.module.model.mdk.sample.dto.SampleInfo;
import com.iailab.module.model.mdk.vo.DataValueVO;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +49,9 @@
private PlanItemApi planItemApi;
@Autowired
+ private IndItemApi indItemApi;
+
+ @Autowired
private MmItemResultService mmItemResultService;
@Autowired
@@ -66,10 +71,11 @@
* @return
*/
@Override
- public List<SampleData> prepareSampleData(SampleInfo sampleInfo) throws Exception {
+ public List<SampleData> prepareSampleData(SampleInfo sampleInfo) throws Exception {
List<SampleData> sampleDataList = new ArrayList<>();
Map<String, ApiPointDTO> pointMap = sampleInfo.getPointMap();
Map<String, ApiPlanItemDTO> planMap = sampleInfo.getPlanMap();
+ Map<String, ApiIndItemDTO> indMap = sampleInfo.getIndMap();
//对每个爪分别进行计算
for (ColumnItemPort entry : sampleInfo.getColumnInfo()) {
//先依据爪内数据项的modelParamOrder进行排序——重写comparator匿名函数
@@ -91,17 +97,19 @@
//对每一项依次进行数据查询,然后将查询出的值赋给matrix对应的位置
for (int i = 0; i < entry.getColumnItemList().size(); i++) {
try {
- List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i),pointMap,planMap);
+ List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap,indMap);
//补全数据
ColumnItem columnItem = entry.getColumnItemList().get(i);
- dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime,
- columnItem.paramId, columnItem.getParamType(),pointMap,planMap);
+ dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.getParamType(),columnItem.getGranularity());
/** 如果数据取不满，把缺失的数据点放在后面 */
if (dataEntityList != null && dataEntityList.size() != 0) {
logger.info("设置matrix, i = " + i + ", size = " + dataEntityList.size());
for (int k = 0; k < dataEntityList.size(); k++) {
- matrix[k][i] = dataEntityList.get(k).getDataValue();
+ Double dataValue = dataEntityList.get(k).getDataValue();
+ if (null != dataValue) {
+ matrix[k][i] = dataValue;
+ }
}
}
} catch (Exception e) {
@@ -122,10 +130,11 @@
* @param columnItem
* @param pointMap
* @param planMap
+ * @param indMap
* @return
* @throws Exception
*/
- private List<DataValueVO> getData(ColumnItem columnItem, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) throws Exception {
+ private List<DataValueVO> getData(ColumnItem columnItem, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap, Map<String, ApiIndItemDTO> indMap) throws Exception {
List<DataValueVO> dataList = new ArrayList<>();
String paramType = columnItem.getParamType();
switch (ModelParamType.getEumByCode(paramType)) {
@@ -147,23 +156,7 @@
break;
case NORMALITEM:
case MERGEITEM:
- MmItemOutputEntity outPut = mmItemOutputService.getOutPutById(columnItem.getParamId());
- OutResultType outResultType = OutResultType.getEumByCode(outPut.getResultType());
- List<DataValueVO> predictValue = new ArrayList<>();
-
- // double类型特殊处理
- if (OutResultType.D.equals(outResultType)) {
- // columnItem.getStartTime()就是预测时间
- String doubleData = mmItemResultJsonService.getDoubleData(outPut.getId(), columnItem.getStartTime());
- if (StringUtils.isNotBlank(doubleData)) {
- DataValueVO dataValueVO = new DataValueVO();
- dataValueVO.setDataTime(columnItem.getStartTime());
- dataValueVO.setDataValue(Double.valueOf(doubleData));
- predictValue.add(dataValueVO);
- }
- } else {
- predictValue = mmItemResultService.getPredictValue(outPut.getId(), columnItem.getStartTime(), columnItem.getEndTime());
- }
+ List<DataValueVO> predictValue = mmItemResultService.getPredictValue(columnItem.getParamId(), columnItem.getStartTime(), columnItem.getEndTime());
if (CollectionUtils.isEmpty(predictValue)) {
break;
@@ -185,6 +178,24 @@
vo.setDataValue(t.getDataValue());
return vo;
}).collect(Collectors.toList());
+ break;
+ case IND:
+ ApiIndItemQueryDTO queryIndItemDTO = new ApiIndItemQueryDTO();
+ ApiIndItemDTO intItem = indMap.get(columnItem.getParamId());
+ queryIndItemDTO.setItemNo(intItem.getItemNo());
+ queryIndItemDTO.setStart(columnItem.getStartTime());
+ queryIndItemDTO.setEnd(columnItem.getEndTime());
+ List<ApiIndItemValueDTO> indItemValueList = indItemApi.queryIndItemHistoryValue(queryIndItemDTO);
+ if (CollectionUtils.isEmpty(indItemValueList)) {
+ break;
+ }
+
+ dataList = indItemValueList.stream().map(t -> {
+ DataValueVO vo = new DataValueVO();
+ vo.setDataTime(DateUtil.parse(t.getDataTime()));
+ vo.setDataValue(t.getDataValue());
+ return vo;
+ }).collect(Collectors.toList());
default:
break;
}
--
Gitblit v1.9.3