Browse Source

运行实验时模型版本属于创建中状态

dev-lhz
chenzhihang 1 year ago
parent
commit
81cec5ea5a
3 changed files with 11 additions and 3 deletions
  1. +4
    -0
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
  2. +5
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
  3. +2
    -2
      ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependency1DaoMapper.xml

+ 4
- 0
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java View File

@@ -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<VersionVo> versionVos = new ArrayList<>();


+ 5
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java View File

@@ -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<String, Object> 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);
}



+ 2
- 2
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependency1DaoMapper.xml View File

@@ -4,8 +4,8 @@


<insert id="insert" keyProperty="id" useGeneratedKeys="true">
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})
</insert>

<select id="queryModelDependency" resultType="com.ruoyi.platform.domain.ModelDependency1">


Loading…
Cancel
Save