From 07890ec0dcb75572740f25a29c80f6d7bddb39e0 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期四, 19 十二月 2024 15:45:46 +0800 Subject: [PATCH] 模型运行测点数据获取方式修改 merge预测模型数据获取方式修改 --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java | 60 ++++++++++++++++++++++-------------------------------------- 1 files changed, 22 insertions(+), 38 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 17002f6..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,12 +1,14 @@ 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.factory.ItemEntityFactory; -import com.iailab.module.model.mdk.factory.ModelEntityFactory; +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; @@ -14,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 @@ -27,15 +32,13 @@ private MmPredictModelService mmPredictModelService; @Autowired - private ModelEntityFactory modelEntityFactory; + private MmModelParamService mmModelParamService; @Autowired - private ItemEntityFactory itemEntityFactory; + private MmPredictItemService mmPredictItemService; - @Override - public SampleInfo prepareSampleInfo(String modelId, Date predictTime) { - return super.prepareSampleInfo(modelId, predictTime); - } + @Autowired + private DataPointApi dataPointApi; /** * 返回样本矩阵的列数 @@ -46,30 +49,6 @@ @Override protected Integer getSampleColumn(String modelId) { return mmPredictModelService.getSampleLength(modelId).intValue(); - } - - /** - * 返回样本的开始时间 - * - * @param columnItem - * @param predictTime - * @return - */ - @Override - protected Date getStartTime(ColumnItem columnItem, Date predictTime) { - return super.getStartTime(columnItem, predictTime); - } - - /** - * 返回样本的结束时间 - * - * @param columnItem - * @param predictTime - * @return - */ - @Override - protected Date getEndTime(ColumnItem columnItem, Date predictTime) { - return super.getEndTime(columnItem, predictTime); } /** @@ -85,7 +64,7 @@ List<ColumnItem> columnItemList = new ArrayList<>(); ColumnItem columnInfo = new ColumnItem(); ColumnItemPort curPort = new ColumnItemPort(); //当前端口 - List<MmModelParamEntity> modelInputParamEntityList = modelEntityFactory.getModelInputParam(modelId); + List<MmModelParamEntity> modelInputParamEntityList = mmModelParamService.getByModelidFromCache(modelId); if (CollectionUtils.isEmpty(modelInputParamEntityList)) { return null; } @@ -93,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.setId(entry.getModelparamid()); + 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)); //对每一个爪进行数据项归并 @@ -135,7 +119,7 @@ */ @Override protected Integer getSampleCycle(String modelId) { - return itemEntityFactory.getItemById(modelEntityFactory.getModelEntity(modelId).getItemid()).getGranularity(); + return mmPredictItemService.getItemByIdFromCache(mmPredictModelService.getInfoFromCatch(modelId).getItemid()).getGranularity(); } -- Gitblit v1.9.3