diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelDependency1Dao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelDependency1Dao.java index c7367379..28baa541 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelDependency1Dao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelDependency1Dao.java @@ -19,6 +19,8 @@ public interface ModelDependency1Dao { List queryByParentModel(@Param("parentModel") String parentModel); + ModelDependency1 queryByTrainTask(@Param("trainTask") String trainTask); + int deleteModel(@Param("repoId") Integer repoId, @Param("identifier") String identifier, @Param("owner") String owner, @Param("version") String version); int deleteModelDependency(@Param("parentModel") String parentModel); 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 ecfa21b5..c2b4e8bc 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 @@ -643,8 +643,7 @@ public class ExperimentServiceImpl implements ExperimentService { modelDependency.setIdentifier((String) targetModel.get("model_identifier")); modelDependency.setVersion((String) targetModel.get("model_version")); modelDependency.setModelName((String) targetModel.get("model_name")); - String meta = JSON.toJSONString(modelMetaVo); - modelDependency.setMeta(meta); + modelDependency.setMeta(JSON.toJSONString(modelMetaVo)); modelDependency1Dao.insert(modelDependency); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java index 5efe94d3..34300b5d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java @@ -716,6 +716,9 @@ public class ModelsServiceImpl implements ModelsService { dvcUtils.dvcCheckout(rootPath); //干掉目标文件夹 dvcUtils.deleteDirectory(modelPath); + + ModelMetaVo modelMetaVo = new ModelMetaVo(); + ModelDependency1 buildingModel = new ModelDependency1(); if (modelsVo.getModelVersionVos() != null && modelsVo.getModelVersionVos().size() != 0) { String sourcePath = modelsVo.getModelVersionVos().get(0).getUrl(); @@ -723,13 +726,15 @@ public class ModelsServiceImpl implements ModelsService { String bucketName = sourcePath.split("/")[0]; String root_path = sourcePath.split("/")[1]; minioUtil.downloadFiles(bucketName, root_path, modelPath); + + buildingModel = modelDependency1Dao.queryByTrainTask(JSON.toJSONString(modelsVo.getTrainTask())); } else { dvcUtils.moveFiles(sourcePath, modelPath); + + buildingModel = modelDependency1Dao.getBuildingModel(modelsVo.getId(), modelsVo.getIdentifier(), modelsVo.getVersion()); } } - ModelMetaVo modelMetaVo = new ModelMetaVo(); - ModelDependency1 buildingModel = modelDependency1Dao.getBuildingModel(modelsVo.getId(), modelsVo.getIdentifier(), modelsVo.getVersion()); if (buildingModel != null) { modelMetaVo = JSON.parseObject(buildingModel.getMeta(), ModelMetaVo.class); //获取指标 diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependency1DaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependency1DaoMapper.xml index 69b6e8b8..c92d842c 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependency1DaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependency1DaoMapper.xml @@ -49,6 +49,13 @@ and state = 2 + + update model_dependency1 set state = 0