From 69bd5efa5e2849a560e604d0aa608d5492113915 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 12 十一月 2024 15:44:52 +0800
Subject: [PATCH] 模型运行输出配置

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java |   47 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 34 insertions(+), 13 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 ef75d02..0f05ef4 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
@@ -4,9 +4,12 @@
 import com.alibaba.fastjson.JSONObject;
 import com.iail.IAILMDK;
 import com.iail.model.IAILModel;
+import com.iailab.module.model.mcs.pre.controller.admin.MmItemOutputController;
+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.MmModelResultstrEntity;
 import com.iailab.module.model.mcs.pre.entity.MmPredictModelEntity;
+import com.iailab.module.model.mcs.pre.service.MmItemOutputService;
 import com.iailab.module.model.mcs.pre.service.MmModelArithSettingsService;
 import com.iailab.module.model.mcs.pre.service.MmModelResultstrService;
 import com.iailab.module.model.mdk.common.enums.TypeA;
@@ -18,12 +21,10 @@
 import com.iailab.module.model.mpk.common.utils.DllUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author PanZhibao
@@ -39,6 +40,8 @@
 
     @Autowired
     private MmModelResultstrService mmModelResultstrService;
+    @Autowired
+    private MmItemOutputService mmItemOutputService;
 
     @Autowired
     private SampleConstructor sampleConstructor;
@@ -93,18 +96,36 @@
             jsonObjResult.put("result", modelResult);
             log.info(String.valueOf(jsonObjResult));
 
-            MmModelResultstrEntity modelResultstr = mmModelResultstrService.getInfo(predictModel.getResultstrid());
-            log.info("模型计算完成:modelId=" + modelId + result);
-            if (modelResult.containsKey(modelResultstr.getResultstr())) {
-                Double[][] temp = (Double[][]) modelResult.get(modelResultstr.getResultstr());
-                double[][] temp1 = new double[temp.length][temp[0].length];
-                for (int i = 0; i < temp.length; i++) {
-                    for (int j = 0; j < temp[i].length; j++) {
-                        temp1[i][j] = temp[i][j].doubleValue();
+            List<MmItemOutputEntity> ItemOutputList = mmItemOutputService.getByItemid(predictModel.getItemid());
+            log.info("模型计算完成:modelId=" + modelId + modelResult);
+
+            Map<MmItemOutputEntity,double[]> predictMatrixs = new HashMap<>(ItemOutputList.size());
+
+            for (MmItemOutputEntity outputEntity : ItemOutputList) {
+                String resultStr = outputEntity.getResultstr();
+                if (modelResult.containsKey(resultStr)) {
+                    if (outputEntity.getResultType() == 1) {
+                        // 一维数组
+                        Double[] temp = (Double[]) modelResult.get(resultStr);
+                        double[] temp1 = new double[temp.length];
+                        for (int i = 0; i < temp.length; i++) {
+                            temp1[i] = temp[i].doubleValue();
+                        }
+                        predictMatrixs.put(outputEntity,temp1);
+                    }else if (outputEntity.getResultType() == 2) {
+                        // 二维数组
+                        Double[][] temp = (Double[][]) modelResult.get(resultStr);
+                        Double[] temp2 = temp[outputEntity.getResultIndex()];
+                        double[] temp1 = new double[temp2.length];
+                        for (int i = 0; i < temp2.length; i++) {
+                            temp1[i] = temp2[i].doubleValue();
+                        }
+                        predictMatrixs.put(outputEntity,temp1);
                     }
                 }
-                result.setPredictMatrix(temp1);
             }
+
+            result.setPredictMatrixs(predictMatrixs);
             result.setModelResult(modelResult);
             result.setPredictTime(predictTime);
         } catch (Exception ex) {

--
Gitblit v1.9.3