From 0cbbe2c1cbfbf73e02e1796d921c2911c96d370b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 11:46:31 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java | 20 +++++++++++++++++---
1 files changed, 17 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 3a8e085..0be1977 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,9 +1,12 @@
package com.iailab.module.model.mdk.sample;
+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.pre.service.MmModelParamService;
import com.iailab.module.model.mcs.pre.service.MmPredictItemService;
import com.iailab.module.model.mcs.pre.service.MmPredictModelService;
+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 org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +16,9 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* @author PanZhibao
@@ -30,6 +36,9 @@
@Autowired
private MmPredictItemService mmPredictItemService;
+
+ @Autowired
+ private DataPointApi dataPointApi;
/**
* 返回样本矩阵的列数
@@ -63,14 +72,19 @@
int curPortOrder = modelInputParamEntityList.get(0).getModelparamportorder();
//设置当前查询数据长度，初始值为最小端口数据长度
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());
+ List<ApiPointDTO> points = dataPointApi.getInfoByIds(pointIds);
+ Map<String, ApiPointDTO> pointMap = points.stream().collect(Collectors.toMap(ApiPointDTO::getId, Function.identity()));
+
for (MmModelParamEntity entry : modelInputParamEntityList) {
columnInfo.setParamType(entry.getModelparamtype());
columnInfo.setParamId(entry.getModelparamid());
columnInfo.setDataLength(entry.getDatalength());
columnInfo.setModelParamOrder(entry.getModelparamorder());
columnInfo.setModelParamPortOrder(entry.getModelparamportorder());
- columnInfo.setStartTime(getStartTime(columnInfo, predictTime));
- columnInfo.setEndTime(getEndTime(columnInfo, predictTime));
+ columnInfo.setStartTime(getStartTime(columnInfo, predictTime,pointMap));
+ columnInfo.setEndTime(getEndTime(columnInfo, predictTime,pointMap));
columnInfo.setGranularity(super.getGranularity(columnInfo));
//对每一个爪进行数据项归并
@@ -105,7 +119,7 @@
*/
@Override
protected Integer getSampleCycle(String modelId) {
- return mmPredictItemService.getItemById(mmPredictModelService.getInfoFromCatch(modelId).getItemid()).getGranularity();
+ return mmPredictItemService.getItemByIdFromCache(mmPredictModelService.getInfoFromCatch(modelId).getItemid()).getGranularity();
}
--
Gitblit v1.9.3