| @@ -296,7 +296,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| ExperimentIns insert = experimentInsService.insert(experimentIns); | ExperimentIns insert = experimentInsService.insert(experimentIns); | ||||
| //插入到模型依赖关系表 | //插入到模型依赖关系表 | ||||
| if (dependendcy != null && trainInfo != null) { | if (dependendcy != null && trainInfo != null) { | ||||
| insertModelDependencyNew(dependendcy, trainInfo, output, insert.getId(), experiment.getId(), experiment.getName(), experiment.getGlobalParam()); | |||||
| insertModelDependencyNew(dependendcy, trainInfo, output, insert.getMetricRecord(), insert.getId(), experiment.getId(), experiment.getName(), experiment.getGlobalParam()); | |||||
| } | } | ||||
| Map<String, Object> datasetDependendcy = (Map<String, Object>) converMap2.get("dataset_dependency"); | Map<String, Object> datasetDependendcy = (Map<String, Object>) converMap2.get("dataset_dependency"); | ||||
| @@ -490,7 +490,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| } | } | ||||
| private void insertModelDependencyNew(Map<String, Object> dependendcy, Map<String, Object> trainInfo, Map<String, Object> output, Integer experimentInsId, Integer experimentId, String experimentName, String globalParam) throws Exception { | |||||
| private void insertModelDependencyNew(Map<String, Object> dependendcy, Map<String, Object> trainInfo, Map<String, Object> output, String metricRecord, Integer experimentInsId, Integer experimentId, String experimentName, String globalParam) { | |||||
| Iterator<Map.Entry<String, Object>> dependendcyIterator = dependendcy.entrySet().iterator(); | Iterator<Map.Entry<String, Object>> dependendcyIterator = dependendcy.entrySet().iterator(); | ||||
| Map<String, Object> modelTrain = (Map<String, Object>) trainInfo.get("model_train"); | Map<String, Object> modelTrain = (Map<String, Object>) trainInfo.get("model_train"); | ||||
| Map<String, Object> modelEvaluate = (Map<String, Object>) trainInfo.get("model_evaluate"); | Map<String, Object> modelEvaluate = (Map<String, Object>) trainInfo.get("model_evaluate"); | ||||
| @@ -532,6 +532,10 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| } | } | ||||
| modelMetaVo.setParams(trainParam); | modelMetaVo.setParams(trainParam); | ||||
| //处理指标 | |||||
| HashMap<String, Object> metricMap = JSON.parseObject(metricRecord, HashMap.class); | |||||
| modelMetaVo.setMetrics(metricMap); | |||||
| //处理source数据 | //处理source数据 | ||||
| List<Map<String, Object>> modelsList = (List<Map<String, Object>>) modelTrainMap.get("models"); | List<Map<String, Object>> modelsList = (List<Map<String, Object>>) modelTrainMap.get("models"); | ||||
| if (modelsList != null) { | if (modelsList != null) { | ||||