From 225a2d8b9ae4f4cdafae6be51c32d04a89bcfa20 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 22 十一月 2024 15:58:04 +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/PredictSampleInfoConstructor.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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..88b2f9a 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,9 @@
package com.iailab.module.model.mdk.sample;
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.sample.dto.ColumnItem;
import com.iailab.module.model.mdk.sample.dto.ColumnItemPort;
import com.iailab.module.model.mdk.sample.dto.SampleInfo;
@@ -27,10 +27,10 @@
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) {
@@ -85,7 +85,7 @@
List<ColumnItem> columnItemList = new ArrayList<>();
ColumnItem columnInfo = new ColumnItem();
ColumnItemPort curPort = new ColumnItemPort(); //当前端口
- List<MmModelParamEntity> modelInputParamEntityList = modelEntityFactory.getModelInputParam(modelId);
+ List<MmModelParamEntity> modelInputParamEntityList = mmModelParamService.getByModelidFromCatch(modelId);
if (CollectionUtils.isEmpty(modelInputParamEntityList)) {
return null;
}
@@ -95,7 +95,7 @@
int curDataLength = modelInputParamEntityList.get(0).getDatalength();
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());
@@ -135,7 +135,7 @@
*/
@Override
protected Integer getSampleCycle(String modelId) {
- return itemEntityFactory.getItemById(modelEntityFactory.getModelEntity(modelId).getItemid()).getGranularity();
+ return mmPredictItemService.getItemById(mmPredictModelService.getInfoFromCatch(modelId).getItemid()).getGranularity();
}
--
Gitblit v1.9.3