From b651cbfd94d8d636c01b61e483ed1cff98e1bcb9 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 16:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java
index 0be1977..4104e2d 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java
@@ -1,5 +1,7 @@
package com.iailab.module.model.mdk.sample;
+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;
import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.model.mcs.pre.entity.MmModelParamEntity;
@@ -9,14 +11,12 @@
import com.iailab.module.model.mdk.common.enums.ModelParamType;
import com.iailab.module.model.mdk.sample.dto.ColumnItem;
import com.iailab.module.model.mdk.sample.dto.ColumnItemPort;
+import com.iailab.module.model.mdk.sample.dto.SampleInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -40,6 +40,9 @@
@Autowired
private DataPointApi dataPointApi;
+ @Autowired
+ private PlanItemApi planItemApi;
+
/**
* 返回样本矩阵的列数
*
@@ -59,7 +62,8 @@
* @return
*/
@Override
- protected List<ColumnItemPort> getColumnInfo(String modelId, Date predictTime) {
+ protected SampleInfo getColumnInfo(String modelId, Date predictTime) {
+ SampleInfo sampleInfo = new SampleInfo();
List<ColumnItemPort> resultList = new ArrayList<>();
List<ColumnItem> columnItemList = new ArrayList<>();
ColumnItem columnInfo = new ColumnItem();
@@ -73,9 +77,13 @@
//设置当前查询数据长度，初始值为最小端口数据长度
int curDataLength = modelInputParamEntityList.get(0).getDatalength();
// 统一获取测点的信息
- List<String> pointIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.DATAPOINT)).map(MmModelParamEntity::getModelparamid).collect(Collectors.toList());
+ Set<String> pointIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.DATAPOINT)).map(MmModelParamEntity::getModelparamid).collect(Collectors.toSet());
List<ApiPointDTO> points = dataPointApi.getInfoByIds(pointIds);
- Map<String, ApiPointDTO> pointMap = points.stream().collect(Collectors.toMap(ApiPointDTO::getId, Function.identity()));
+ Map<String, ApiPointDTO> pointMap = points.stream().collect(Collectors.toMap(ApiPointDTO::getId, Function.identity(), (e1,e2) -> e1));
+ // 统一获取计划数据的信息
+ Set<String> planIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.PLAN)).map(MmModelParamEntity::getModelparamid).collect(Collectors.toSet());
+ List<ApiPlanItemDTO> plans = planItemApi.getInfoByIds(planIds);
+ Map<String, ApiPlanItemDTO> planMap = plans.stream().collect(Collectors.toMap(ApiPlanItemDTO::getId, Function.identity(), (e1,e2) -> e1));
for (MmModelParamEntity entry : modelInputParamEntityList) {
columnInfo.setParamType(entry.getModelparamtype());
@@ -83,9 +91,9 @@
columnInfo.setDataLength(entry.getDatalength());
columnInfo.setModelParamOrder(entry.getModelparamorder());
columnInfo.setModelParamPortOrder(entry.getModelparamportorder());
- columnInfo.setStartTime(getStartTime(columnInfo, predictTime,pointMap));
- columnInfo.setEndTime(getEndTime(columnInfo, predictTime,pointMap));
- columnInfo.setGranularity(super.getGranularity(columnInfo));
+ columnInfo.setStartTime(getStartTime(columnInfo, predictTime,pointMap,planMap));
+ columnInfo.setEndTime(getEndTime(columnInfo, predictTime,pointMap,planMap));
+ columnInfo.setGranularity(super.getGranularity(columnInfo,pointMap,planMap));
//对每一个爪进行数据项归并
if (curPortOrder != entry.getModelparamportorder()){
@@ -108,7 +116,10 @@
curPort.setDataLength(curDataLength);
curPort.setPortOrder(curPortOrder);
resultList.add(curPort);
- return resultList;
+ sampleInfo.setColumnInfo(resultList);
+ sampleInfo.setPointMap(pointMap);
+ sampleInfo.setPlanMap(planMap);
+ return sampleInfo;
}
/**
--
Gitblit v1.9.3