From 8aadcbe920f02806b9fa363b386d3d6c693c5c56 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 07 二月 2025 16:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java
index 6d1ebbd..dd80a49 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java
@@ -2,15 +2,13 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.iail.model.IAILModel;
-import com.iailab.module.model.common.enums.CommonConstant;
+import com.iailab.module.model.enums.CommonConstant;
import com.iailab.module.model.common.enums.OutResultType;
import com.iailab.module.model.common.exception.ModelResultErrorException;
import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.pre.entity.MmModelArithSettingsEntity;
import com.iailab.module.model.mcs.pre.entity.MmPredictModelEntity;
-import com.iailab.module.model.mcs.pre.enums.ItemRunStatusEnum;
import com.iailab.module.model.mcs.pre.service.MmItemOutputService;
import com.iailab.module.model.mcs.pre.service.MmModelArithSettingsService;
import com.iailab.module.model.mdk.common.enums.TypeA;
@@ -64,7 +62,7 @@
}
String modelId = predictModel.getId();
try {
- List<SampleData> sampleDataList = sampleConstructor.constructSample(TypeA.Predict.name(), modelId, predictTime, itemName);
+ List<SampleData> sampleDataList = sampleConstructor.constructSample(TypeA.Predict.name(), modelId, predictTime, itemName, new HashMap<>());
String modelPath = predictModel.getModelpath();
if (modelPath == null) {
log.info("模型路径不存在，modelId=" + modelId);
@@ -110,7 +108,6 @@
List<MmItemOutputEntity> itemOutputList = mmItemOutputService.getByItemid(predictModel.getItemid());
Map<MmItemOutputEntity, double[]> predictMatrixs = new HashMap<>();
- Map<MmItemOutputEntity, Double> predictDoubleValues = new HashMap<>();
for (MmItemOutputEntity output : itemOutputList) {
if (!modelResult.containsKey(output.getResultstr())) {
continue;
@@ -131,14 +128,13 @@
break;
case D:
Double temp3 = (Double) modelResult.get(output.getResultstr());
- predictDoubleValues.put(output, temp3);
+ predictMatrixs.put(output, new double[]{temp3});
break;
default:
break;
}
}
result.setPredictMatrixs(predictMatrixs);
- result.setPredictDoubleValues(predictDoubleValues);
result.setModelResult(modelResult);
result.setPredictTime(predictTime);
} catch (ModelResultErrorException ex) {
--
Gitblit v1.9.3