From 81cec5ea5aba2d1515ab4dae144c3a50d05d5b80 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Mon, 23 Sep 2024 16:48:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=AE=9E=E9=AA=8C=E6=97=B6?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=89=88=E6=9C=AC=E5=B1=9E=E4=BA=8E=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=B8=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/platform/service/impl/ExperimentServiceImpl.java | 4 ++++ .../com/ruoyi/platform/service/impl/ModelsServiceImpl.java | 6 +++++- .../mapper/managementPlatform/ModelDependency1DaoMapper.xml | 4 ++-- 3 files changed, 11 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 293a4e10..27d34ae0 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 @@ -600,6 +600,10 @@ public class ExperimentServiceImpl implements ExperimentService { modelMetaVo.setName((String) targetModel.get("model_name")); modelMetaVo.setVersion((String) targetModel.get("model_version")); modelMetaVo.setOwner(gitLinkUsername); + + modelDependency.setRepoId(Integer.valueOf((String) targetModel.get("model_id"))); + modelDependency.setIdentifier((String) targetModel.get("model_identifier")); + modelDependency.setVersion((String) targetModel.get("model_version")); modelDependency.setModelName((String) targetModel.get("model_name")); List versionVos = new ArrayList<>(); 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 95dc35c2..07d1d97a 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 @@ -636,6 +636,7 @@ public class ModelsServiceImpl implements ModelsService { modelDependency.setParentModel(modelsVo.getParentModel()); modelDependency.setOwner(gitLinkUsername); modelDependency.setMeta(meta); + modelDependency.setState(Constant.State_valid); modelDependency1Dao.insert(modelDependency); CompletableFuture.supplyAsync(() -> { @@ -719,6 +720,9 @@ public class ModelsServiceImpl implements ModelsService { } } + ModelDependency1 buildingModel = modelDependency1Dao.getBuildingModel(modelsVo.getId(), modelsVo.getIdentifier(), modelsVo.getVersion()); + ModelMetaVo modelMetaVo1 = JSON.parseObject(buildingModel.getMeta(), ModelMetaVo.class); + //拼接生产的元数据后写入yaml文件 ModelMetaVo modelMetaVo = new ModelMetaVo(); BeanUtils.copyProperties(modelsVo, modelMetaVo); @@ -752,7 +756,6 @@ public class ModelsServiceImpl implements ModelsService { Map params = modelMetaVo.getParams(); YamlUtils.generateYamlFile(params, rootPath, "params"); - ModelDependency1 buildingModel = modelDependency1Dao.getBuildingModel(modelsVo.getId(), modelsVo.getIdentifier(), modelsVo.getVersion()); if (buildingModel != null) { //更新模型依赖 modelDependency1Dao.updateState(modelsVo.getId(), modelsVo.getIdentifier(), modelsVo.getVersion(), Constant.State_valid); @@ -765,6 +768,7 @@ public class ModelsServiceImpl implements ModelsService { modelDependency.setParentModel(modelsVo.getParentModel()); modelDependency.setOwner(gitLinkUsername); modelDependency.setMeta(meta); + modelDependency.setState(Constant.State_valid); modelDependency1Dao.insert(modelDependency); } 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 031a2d73..69b6e8b8 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 @@ -4,8 +4,8 @@ - insert into model_dependency1(parent_model, model_name, version, repo_id, identifier, owner, meta) - values (#{parentModel}, #{modelName}, #{version}, #{repoId}, #{identifier}, #{owner}, #{meta}) + insert into model_dependency1(parent_model, model_name, version, repo_id, identifier, owner, meta, state) + values (#{parentModel}, #{modelName}, #{version}, #{repoId}, #{identifier}, #{owner}, #{meta}, #{state})