From 5bf42aa9950058f391805e6fb8d7376f4378924b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 16:16:55 +0800
Subject: [PATCH] cumulateHandle.getCurrent
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java | 79 ++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 42 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 8b45b26..4104e2d 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,14 @@
package com.iailab.module.model.mdk.sample;
+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.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;
@@ -11,9 +16,9 @@
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.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* @author PanZhibao
@@ -27,15 +32,16 @@
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;
+
+ @Autowired
+ private PlanItemApi planItemApi;
/**
* 返回样本矩阵的列数
@@ -49,30 +55,6 @@
}
/**
- * 返回样本的开始时间
- *
- * @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);
- }
-
- /**
* 样本的列信息
*
* @param modelId
@@ -80,12 +62,13 @@
* @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();
ColumnItemPort curPort = new ColumnItemPort(); //当前端口
- List<MmModelParamEntity> modelInputParamEntityList = modelEntityFactory.getModelInputParam(modelId);
+ List<MmModelParamEntity> modelInputParamEntityList = mmModelParamService.getByModelidFromCache(modelId);
if (CollectionUtils.isEmpty(modelInputParamEntityList)) {
return null;
}
@@ -93,15 +76,24 @@
int curPortOrder = modelInputParamEntityList.get(0).getModelparamportorder();
//设置当前查询数据长度，初始值为最小端口数据长度
int curDataLength = modelInputParamEntityList.get(0).getDatalength();
+ // 统一获取测点的信息
+ 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(), (e1,e2) -> e1));
+ // 统一获取计划数据的信息
+ 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));
+
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.setGranularity(super.getGranularity(columnInfo));
+ columnInfo.setStartTime(getStartTime(columnInfo, predictTime,pointMap,planMap));
+ columnInfo.setEndTime(getEndTime(columnInfo, predictTime,pointMap,planMap));
+ columnInfo.setGranularity(super.getGranularity(columnInfo,pointMap,planMap));
//对每一个爪进行数据项归并
if (curPortOrder != entry.getModelparamportorder()){
@@ -124,7 +116,10 @@
curPort.setDataLength(curDataLength);
curPort.setPortOrder(curPortOrder);
resultList.add(curPort);
- return resultList;
+ sampleInfo.setColumnInfo(resultList);
+ sampleInfo.setPointMap(pointMap);
+ sampleInfo.setPlanMap(planMap);
+ return sampleInfo;
}
/**
@@ -135,7 +130,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