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/PredictSampleInfoConstructor.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 ae066fe..6d93c9f 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.ind.IndItemApi;
+import com.iailab.module.data.api.ind.dto.ApiIndItemDTO;
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;
@@ -43,6 +45,9 @@
@Autowired
private PlanItemApi planItemApi;
+ @Autowired
+ private IndItemApi indItemApi;
+
/**
* 返回样本矩阵的列数
*
@@ -84,6 +89,10 @@
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));
+ // 统一获取指标数据的信息
+ Set<String> indIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.IND)).map(MmModelParamEntity::getModelparamid).collect(Collectors.toSet());
+ List<ApiIndItemDTO> inds = indItemApi.getInfoByIds(indIds);
+ Map<String, ApiIndItemDTO> indMap = inds.stream().collect(Collectors.toMap(ApiIndItemDTO::getId, Function.identity(), (e1, e2) -> e1));
for (MmModelParamEntity entry : modelInputParamEntityList) {
columnInfo.setParamType(entry.getModelparamtype());
@@ -91,9 +100,9 @@
columnInfo.setDataLength(super.getDataLength(dynamicDataLength, entry.getModelparamportorder(), entry.getDatalength()));
columnInfo.setModelParamOrder(entry.getModelparamorder());
columnInfo.setModelParamPortOrder(entry.getModelparamportorder());
- columnInfo.setStartTime(getStartTime(columnInfo, predictTime, pointMap, planMap));
- columnInfo.setEndTime(getEndTime(columnInfo, predictTime, pointMap, planMap));
- columnInfo.setGranularity(super.getGranularity(columnInfo, pointMap, planMap));
+ columnInfo.setGranularity(super.getGranularity(columnInfo, pointMap, planMap,indMap));
+ columnInfo.setStartTime(getStartTime(columnInfo, predictTime));
+ columnInfo.setEndTime(getEndTime(columnInfo, predictTime));
//对每一个爪进行数据项归并
if (curPortOrder != entry.getModelparamportorder()) {
@@ -119,6 +128,7 @@
sampleInfo.setColumnInfo(resultList);
sampleInfo.setPointMap(pointMap);
sampleInfo.setPlanMap(planMap);
+ sampleInfo.setIndMap(indMap);
return sampleInfo;
}
--
Gitblit v1.9.3