| @@ -501,6 +501,10 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| while (dependendcyIterator.hasNext()) { | while (dependendcyIterator.hasNext()) { | ||||
| ModelsVo modelMetaVo = new ModelsVo(); | ModelsVo modelMetaVo = new ModelsVo(); | ||||
| modelMetaVo.setOwner(gitLinkUsername); | |||||
| ModelDependency1 modelDependency = new ModelDependency1(); | |||||
| modelDependency.setOwner(gitLinkUsername); | |||||
| modelDependency.setState(Constant.State_building); | |||||
| Map.Entry<String, Object> entry = dependendcyIterator.next(); | Map.Entry<String, Object> entry = dependendcyIterator.next(); | ||||
| Map<String, Object> modelDel = (Map<String, Object>) entry.getValue(); | Map<String, Object> modelDel = (Map<String, Object>) entry.getValue(); | ||||
| @@ -554,6 +558,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| } | } | ||||
| modelMetaVo.setTrainDatasets(trainDatasets); | modelMetaVo.setTrainDatasets(trainDatasets); | ||||
| } | } | ||||
| //训练任务 | //训练任务 | ||||
| TrainTaskDepency trainTask = new TrainTaskDepency(); | TrainTaskDepency trainTask = new TrainTaskDepency(); | ||||
| trainTask.setWorkflowId(workflowId); | trainTask.setWorkflowId(workflowId); | ||||
| @@ -578,9 +583,6 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| String parentModel = JSON.toJSONString(map); | String parentModel = JSON.toJSONString(map); | ||||
| modelMetaVo.setParentModel(parentModel); | modelMetaVo.setParentModel(parentModel); | ||||
| ModelDependency1 modelDependency = new ModelDependency1(); | |||||
| modelDependency.setOwner(gitLinkUsername); | |||||
| modelDependency.setState(Constant.State_building); | |||||
| modelDependency.setParentModel(parentModel); | modelDependency.setParentModel(parentModel); | ||||
| modelDependency.setMeta(JSON.toJSONString(modelMetaVo)); | modelDependency.setMeta(JSON.toJSONString(modelMetaVo)); | ||||
| modelDependency1Dao.insert(modelDependency); | modelDependency1Dao.insert(modelDependency); | ||||
| @@ -607,7 +609,6 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| } | } | ||||
| //处理target数据 | //处理target数据 | ||||
| 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++) { | ||||
| Map<String, Object> targetMap = target.get(i); | Map<String, Object> targetMap = target.get(i); | ||||
| @@ -622,26 +623,22 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| modelMetaVo.setIdentifier((String) targetModel.get("model_identifier")); | modelMetaVo.setIdentifier((String) targetModel.get("model_identifier")); | ||||
| modelMetaVo.setName((String) targetModel.get("model_name")); | modelMetaVo.setName((String) targetModel.get("model_name")); | ||||
| modelMetaVo.setVersion((String) targetModel.get("model_version")); | modelMetaVo.setVersion((String) targetModel.get("model_version")); | ||||
| modelMetaVo.setOwner(gitLinkUsername); | |||||
| List<VersionVo> versionVos = new ArrayList<>(); | |||||
| for (Map<String, Object> outputFile : outputList) { | |||||
| String path = (String) outputFile.get("path"); | |||||
| List<Map<String, Object>> files = FileUtil.getFiles(path); | |||||
| for (Map<String, Object> fileDetail : files) { | |||||
| VersionVo versionVo = new VersionVo(); | |||||
| versionVo.setUrl((String) fileDetail.get("filePath")); | |||||
| versionVo.setFileName((String) fileDetail.get("fileName")); | |||||
| long size = (long) fileDetail.get("size"); | |||||
| versionVo.setFileSize(FileUtil.formatFileSize(size)); | |||||
| versionVos.add(versionVo); | |||||
| } | |||||
| } | |||||
| modelMetaVo.setModelVersionVos(versionVos); | |||||
| ModelDependency1 modelDependency = new ModelDependency1(); | |||||
| modelDependency.setOwner(gitLinkUsername); | |||||
| modelDependency.setState(Constant.State_building); | |||||
| // List<VersionVo> versionVos = new ArrayList<>(); | |||||
| // for (Map<String, Object> outputFile : outputList) { | |||||
| // String path = (String) outputFile.get("path"); | |||||
| // List<Map<String, Object>> files = FileUtil.getFiles(path); | |||||
| // for (Map<String, Object> fileDetail : files) { | |||||
| // VersionVo versionVo = new VersionVo(); | |||||
| // versionVo.setUrl((String) fileDetail.get("filePath")); | |||||
| // versionVo.setFileName((String) fileDetail.get("fileName")); | |||||
| // long size = (long) fileDetail.get("size"); | |||||
| // versionVo.setFileSize(FileUtil.formatFileSize(size)); | |||||
| // versionVos.add(versionVo); | |||||
| // } | |||||
| // } | |||||
| // modelMetaVo.setModelVersionVos(versionVos); | |||||
| modelDependency.setRepoId(Integer.valueOf((String) targetModel.get("model_id"))); | modelDependency.setRepoId(Integer.valueOf((String) targetModel.get("model_id"))); | ||||
| modelDependency.setIdentifier((String) targetModel.get("model_identifier")); | modelDependency.setIdentifier((String) targetModel.get("model_identifier")); | ||||
| modelDependency.setVersion((String) targetModel.get("model_version")); | modelDependency.setVersion((String) targetModel.get("model_version")); | ||||