| @@ -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.getName(), experiment.getGlobalParam()); | |||||
| insertModelDependencyNew(dependendcy, trainInfo, output, 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, String experimentName, String globalParam) throws Exception { | |||||
| 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 { | |||||
| 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"); | ||||
| @@ -521,7 +521,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| Map<String, String> imagesMap = (Map<String, String>) modelTrainMap.get("image"); | Map<String, String> imagesMap = (Map<String, String>) modelTrainMap.get("image"); | ||||
| modelMetaVo.setImage(imagesMap.get("name")); | modelMetaVo.setImage(imagesMap.get("name")); | ||||
| //处理训练参数 todo | |||||
| //处理训练参数 | |||||
| HashMap<String, Object> trainParam = new HashMap<>(); | HashMap<String, Object> trainParam = new HashMap<>(); | ||||
| JSONArray jsonArray = JSONArray.parseArray(globalParam); | JSONArray jsonArray = JSONArray.parseArray(globalParam); | ||||
| for (int i = 0; i < jsonArray.size(); i++) { | for (int i = 0; i < jsonArray.size(); i++) { | ||||
| @@ -569,6 +569,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| trainTask.setTaskId(sourceTaskId); | trainTask.setTaskId(sourceTaskId); | ||||
| trainTask.setInsId(experimentInsId); | trainTask.setInsId(experimentInsId); | ||||
| trainTask.setName(experimentName); | trainTask.setName(experimentName); | ||||
| trainTask.setExperimentId(experimentId); | |||||
| modelMetaVo.setTrainTask(trainTask); | modelMetaVo.setTrainTask(trainTask); | ||||
| //处理test数据 | //处理test数据 | ||||
| @@ -594,7 +595,6 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| //处理target数据 | //处理target数据 | ||||
| LoginUser loginUser = SecurityUtils.getLoginUser(); | LoginUser loginUser = SecurityUtils.getLoginUser(); | ||||
| String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); | String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); | ||||
| // String gitLinkUsername = "fanshuai"; | |||||
| modelMetaVo.setOwner(gitLinkUsername); | modelMetaVo.setOwner(gitLinkUsername); | ||||
| if (target != null) { | if (target != null) { | ||||
| for (int i = 0; i < target.size(); i++) { | for (int i = 0; i < target.size(); i++) { | ||||