| @@ -19,6 +19,8 @@ public interface ModelDependency1Dao { | |||||
| List<ModelDependency1> queryByParentModel(@Param("parentModel") String parentModel); | List<ModelDependency1> 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 deleteModel(@Param("repoId") Integer repoId, @Param("identifier") String identifier, @Param("owner") String owner, @Param("version") String version); | ||||
| int deleteModelDependency(@Param("parentModel") String parentModel); | int deleteModelDependency(@Param("parentModel") String parentModel); | ||||
| @@ -643,8 +643,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| modelDependency.setIdentifier((String) targetModel.get("model_identifier")); | modelDependency.setIdentifier((String) targetModel.get("model_identifier")); | ||||
| modelDependency.setVersion((String) targetModel.get("model_version")); | modelDependency.setVersion((String) targetModel.get("model_version")); | ||||
| modelDependency.setModelName((String) targetModel.get("model_name")); | modelDependency.setModelName((String) targetModel.get("model_name")); | ||||
| String meta = JSON.toJSONString(modelMetaVo); | |||||
| modelDependency.setMeta(meta); | |||||
| modelDependency.setMeta(JSON.toJSONString(modelMetaVo)); | |||||
| modelDependency1Dao.insert(modelDependency); | modelDependency1Dao.insert(modelDependency); | ||||
| } | } | ||||
| } | } | ||||
| @@ -716,6 +716,9 @@ public class ModelsServiceImpl implements ModelsService { | |||||
| dvcUtils.dvcCheckout(rootPath); | dvcUtils.dvcCheckout(rootPath); | ||||
| //干掉目标文件夹 | //干掉目标文件夹 | ||||
| dvcUtils.deleteDirectory(modelPath); | dvcUtils.deleteDirectory(modelPath); | ||||
| ModelMetaVo modelMetaVo = new ModelMetaVo(); | |||||
| ModelDependency1 buildingModel = new ModelDependency1(); | |||||
| if (modelsVo.getModelVersionVos() != null && modelsVo.getModelVersionVos().size() != 0) { | if (modelsVo.getModelVersionVos() != null && modelsVo.getModelVersionVos().size() != 0) { | ||||
| String sourcePath = modelsVo.getModelVersionVos().get(0).getUrl(); | String sourcePath = modelsVo.getModelVersionVos().get(0).getUrl(); | ||||
| @@ -723,13 +726,15 @@ public class ModelsServiceImpl implements ModelsService { | |||||
| String bucketName = sourcePath.split("/")[0]; | String bucketName = sourcePath.split("/")[0]; | ||||
| String root_path = sourcePath.split("/")[1]; | String root_path = sourcePath.split("/")[1]; | ||||
| minioUtil.downloadFiles(bucketName, root_path, modelPath); | minioUtil.downloadFiles(bucketName, root_path, modelPath); | ||||
| buildingModel = modelDependency1Dao.queryByTrainTask(JSON.toJSONString(modelsVo.getTrainTask())); | |||||
| } else { | } else { | ||||
| dvcUtils.moveFiles(sourcePath, modelPath); | 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) { | if (buildingModel != null) { | ||||
| modelMetaVo = JSON.parseObject(buildingModel.getMeta(), ModelMetaVo.class); | modelMetaVo = JSON.parseObject(buildingModel.getMeta(), ModelMetaVo.class); | ||||
| //获取指标 | //获取指标 | ||||
| @@ -49,6 +49,13 @@ | |||||
| and state = 2 | and state = 2 | ||||
| </select> | </select> | ||||
| <select id="queryByTrainTask" resultType="com.ruoyi.platform.domain.ModelDependency1"> | |||||
| select * | |||||
| from model_dependency1 | |||||
| where JSON_CONTAINS(meta, #{trainTask}) | |||||
| and state = 2 | |||||
| </select> | |||||
| <update id="deleteModel"> | <update id="deleteModel"> | ||||
| update model_dependency1 | update model_dependency1 | ||||
| set state = 0 | set state = 0 | ||||