From b3d274f79ce78a1fbefe5b9c596f6b53aab50d3f Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Thu, 19 Sep 2024 16:56:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExperimentServiceImpl.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java index 4a2f2c57..85c2f54f 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java @@ -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 modelExport = (Map) trainInfo.get("model_export"); while (dependendcyIterator.hasNext()) { ModelsVo modelMetaVo = new ModelsVo(); + ModelDependency1 modelDependency = new ModelDependency1(); Map.Entry entry = dependendcyIterator.next(); Map modelDel = (Map) 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 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); } }