From 50084de4a140dece61019b64fd91df041d242e47 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 23 十二月 2024 15:28:53 +0800
Subject: [PATCH] getInfoByIds(Set<String> pointIds) 模型输入计划数据获取、补全 模型输入mergeitem存默认生成的outputid sampleInfo.setPointMap 避免重复查询point
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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..c79b974 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
@@ -9,14 +9,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;
@@ -59,7 +57,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 +72,9 @@
//设置当前查询数据长度，初始值为最小端口数据长度
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));
for (MmModelParamEntity entry : modelInputParamEntityList) {
columnInfo.setParamType(entry.getModelparamtype());
@@ -108,7 +107,9 @@
curPort.setDataLength(curDataLength);
curPort.setPortOrder(curPortOrder);
resultList.add(curPort);
- return resultList;
+ sampleInfo.setColumnInfo(resultList);
+ sampleInfo.setPointMap(pointMap);
+ return sampleInfo;
}
/**
--
Gitblit v1.9.3