| @@ -8,16 +8,18 @@ import com.ruoyi.platform.domain.dependencydomain.ProjectDepency; | |||
| import com.ruoyi.platform.domain.dependencydomain.TrainTaskDepency; | |||
| import com.ruoyi.platform.mapper.ExperimentDao; | |||
| import com.ruoyi.platform.mapper.ExperimentInsDao; | |||
| import com.ruoyi.platform.mapper.ModelDependency1Dao; | |||
| import com.ruoyi.platform.service.*; | |||
| import com.ruoyi.platform.utils.HttpUtils; | |||
| import com.ruoyi.platform.utils.JacksonUtil; | |||
| import com.ruoyi.platform.utils.JsonUtils; | |||
| import com.ruoyi.platform.utils.NewHttpUtils; | |||
| import com.ruoyi.platform.vo.ModelMetaVo; | |||
| import com.ruoyi.platform.vo.ModelsVo; | |||
| import com.ruoyi.platform.vo.NewDatasetVo; | |||
| import com.ruoyi.system.api.model.LoginUser; | |||
| import org.apache.commons.collections4.MapUtils; | |||
| import org.apache.commons.lang3.StringUtils; | |||
| import org.springframework.beans.BeanUtils; | |||
| import org.springframework.beans.factory.annotation.Value; | |||
| import org.springframework.context.annotation.Lazy; | |||
| import org.springframework.data.domain.Page; | |||
| @@ -59,6 +61,10 @@ public class ExperimentServiceImpl implements ExperimentService { | |||
| @Resource | |||
| @Lazy | |||
| private ExperimentInsService experimentInsService; | |||
| @Resource | |||
| private ModelDependency1Dao modelDependency1Dao; | |||
| @Value("${argo.url}") | |||
| private String argoUrl; | |||
| @Value("${argo.convert}") | |||
| @@ -488,6 +494,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||
| Map<String, Object> modelExport = (Map<String, Object>) trainInfo.get("model_export"); | |||
| while (dependendcyIterator.hasNext()) { | |||
| ModelsVo modelMetaVo = new ModelsVo(); | |||
| ModelDependency1 modelDependency = new ModelDependency1(); | |||
| Map.Entry<String, Object> entry = dependendcyIterator.next(); | |||
| Map<String, Object> modelDel = (Map<String, Object>) entry.getValue(); | |||
| @@ -525,6 +532,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||
| map.put("version", version); | |||
| String parentModel = JSON.toJSONString(map); | |||
| modelMetaVo.setParentModel(parentModel); | |||
| modelDependency.setParentModel(parentModel); | |||
| } | |||
| //训练数据集 | |||
| @@ -569,9 +577,10 @@ public class ExperimentServiceImpl implements ExperimentService { | |||
| } | |||
| //处理target数据 | |||
| LoginUser loginUser = SecurityUtils.getLoginUser(); | |||
| String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); | |||
| modelMetaVo.setOwner(gitLinkUsername); | |||
| if (target != null) { | |||
| LoginUser loginUser = SecurityUtils.getLoginUser(); | |||
| String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); | |||
| for (int i = 0; i < target.size(); i++) { | |||
| Map<String, Object> targetMap = target.get(i); | |||
| String targetTaskId = (String) targetMap.get("task_id"); | |||
| @@ -588,6 +597,11 @@ public class ExperimentServiceImpl implements ExperimentService { | |||
| modelsService.newCreateVersion(modelMetaVo); | |||
| } | |||
| } | |||
| } else { | |||
| String meta = JSON.toJSONString(modelMetaVo); | |||
| modelDependency.setMeta(meta); | |||
| modelDependency.setOwner(gitLinkUsername); | |||
| modelDependency1Dao.insert(modelDependency); | |||
| } | |||
| } | |||