From 8b43a1a91c37676e6a1e506e211f60e3e238f669 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 20 二月 2025 16:23:48 +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/ScheduleSampleInfoConstructor.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java
index af0425d..e8aa4a0 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java
@@ -1,9 +1,12 @@
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;
import com.iailab.module.data.api.point.dto.ApiPointDTO;
+import com.iailab.module.model.mcs.pre.entity.MmModelParamEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelParamEntity;
import com.iailab.module.model.mcs.sche.service.StScheduleModelParamService;
import com.iailab.module.model.mdk.common.enums.ModelParamType;
@@ -29,6 +32,9 @@
@Autowired
private PlanItemApi planItemApi;
+
+ @Autowired
+ private IndItemApi indItemApi;
@Override
protected Integer getSampleColumn(String modelId) {
@@ -57,7 +63,11 @@
// 统一获取计划数据的信息
Set<String> planIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.PLAN)).map(StScheduleModelParamEntity::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));
+ 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) || ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.IND_ASCII)).map(StScheduleModelParamEntity::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 (StScheduleModelParamEntity entry : modelInputParamEntityList) {
columnInfo.setParamType(entry.getModelparamtype());
@@ -65,12 +75,12 @@
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()){
+ if (curPortOrder != entry.getModelparamportorder()) {
//当数据项端口号不为当前端口号时，封装上一个端口类，操作下一个端口类
curPort.setColumnItemList(columnItemList);
curPort.setDataLength(curDataLength);
@@ -93,6 +103,7 @@
sampleInfo.setColumnInfo(resultList);
sampleInfo.setPointMap(pointMap);
sampleInfo.setPlanMap(planMap);
+ sampleInfo.setIndMap(indMap);
return sampleInfo;
}
@@ -100,7 +111,6 @@
protected Integer getSampleCycle(String modelId) {
return null;
}
-
}
--
Gitblit v1.9.3