From e1c93ae81ee51807417a1dd232420a4bc8e9b32e Mon Sep 17 00:00:00 2001 From: ddmte32 Date: Tue, 12 Aug 2025 16:45:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E3=80=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E7=89=88=E6=9C=AC=E5=90=8E=E7=AB=AF=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExperimentServiceImpl.java | 21 +++++++++++++++---- .../service/impl/ModelsServiceImpl.java | 5 +++++ .../service/impl/NewDatasetServiceImpl.java | 10 +++------ 3 files changed, 25 insertions(+), 11 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 b4c35ed0..0fc4a13c 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 @@ -675,7 +675,8 @@ public class ExperimentServiceImpl implements ExperimentService { modelMetaVo.setId((Integer) targetModel.get("model_id")); modelMetaVo.setIdentifier((String) targetModel.get("model_identifier")); modelMetaVo.setName((String) targetModel.get("model_name")); - modelMetaVo.setVersion((String) targetModel.get("model_version")); + modelMetaVo.setVersion(queryNextModelVersion((String) targetModel.get("model_identifier"), (String) targetModel.get("model_owner"))); + // List versionVos = new ArrayList<>(); // for (Map outputFile : outputList) { @@ -692,11 +693,11 @@ public class ExperimentServiceImpl implements ExperimentService { // } // modelMetaVo.setModelVersionVos(versionVos); + modelDependency.setMeta(JSON.toJSONString(modelMetaVo)); modelDependency.setRepoId((Integer) 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")); - modelDependency.setMeta(JSON.toJSONString(modelMetaVo)); + modelDependency.setIdentifier((String) targetModel.get("model_identifier")); + modelDependency.setVersion(queryNextModelVersion((String) targetModel.get("model_identifier"), (String) targetModel.get("model_owner"))); modelDependency1Dao.insert(modelDependency); } } @@ -704,6 +705,18 @@ public class ExperimentServiceImpl implements ExperimentService { } } + private String queryNextModelVersion(String identifier, String owner) { + try { + ModelsVersion modelsVersion = new ModelsVersion(); + modelsVersion.setOwner(owner); + modelsVersion.setIdentifier(identifier); + return modelsService.getNextVersion(modelsVersion); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + /** * 被废弃的旧JSON * 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 256ec418..c6464b6a 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 @@ -698,6 +698,11 @@ public class ModelsServiceImpl implements ModelsService { Map userInfo = getUserInfo(ci4sUsername, gitLinkPassword); gitLinkPassword = decrypt(gitLinkPassword); + List> versionList = getVersionList(modelsVo.getIdentifier(), modelsVo.getOwner()); + //自动填充版本 + String nextVersion = incrementVersion(versionList); + modelsVo.setVersion(nextVersion); + ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername(); String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier(); ModelDependency1 modelDependency = new ModelDependency1(); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java index d0a0b1b1..3bb3496e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java @@ -183,13 +183,9 @@ public class NewDatasetServiceImpl implements NewDatasetService { public String newCreateVersion(NewDatasetVo datasetVo) throws Exception { List> versionList = getVersionList(datasetVo.getIdentifier(), datasetVo.getOwner()); - //TODO 查出最新的自定义版本，在此基础上升级一个版本 - for (Map versionMap : versionList) { - String version = (String) versionMap.get("name"); - if (version.equals(datasetVo.getVersion())) { - throw new Exception("数据集版本已存在，请勿重复创建"); - } - } + //自动填充版本 + String nextVersion = incrementVersion(versionList); + datasetVo.setVersion(nextVersion); String token = gitService.checkoutToken(); Jedis jedis = new Jedis(redisHost, redisPort);