模型、数据集版本后端生成

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<VersionVo> versionVos = new ArrayList<>();
 //                        for (Map<String, Object> 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
      *

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

@@ -698,6 +698,11 @@ public class ModelsServiceImpl implements ModelsService {
         Map<String, Object> userInfo = getUserInfo(ci4sUsername, gitLinkPassword);
         gitLinkPassword = decrypt(gitLinkPassword);
 
+        List<Map<String, Object>> 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();

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<Map<String, Object>> versionList = getVersionList(datasetVo.getIdentifier(), datasetVo.getOwner());
-        //TODO 查出最新的自定义版本，在此基础上升级一个版本
-        for (Map<String, Object> 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);