From 8ed145326d10fb2c0a9a3d47f4f6b05f2e97f361 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Wed, 18 Sep 2024 09:51:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ModelsServiceImpl.java | 68 +++++++------------ .../service/impl/NewDatasetServiceImpl.java | 40 +++++------ 2 files changed, 46 insertions(+), 62 deletions(-) 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 6513cb5c..ad2309f8 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 @@ -548,10 +548,6 @@ public class ModelsServiceImpl implements ModelsService { String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); -// String ci4sUsername = "chenzhihang"; -// String gitLinkUsername = "chenzhihang"; -// String gitLinkPassword = "czh19970311"; - Map userInfo = getUserInfo(ci4sUsername, gitLinkUsername, gitLinkPassword); Integer userId = (Integer) userInfo.get("user_id"); @@ -574,17 +570,17 @@ public class ModelsServiceImpl implements ModelsService { gitProjectVo.setUserId(userId); // 创建项目 - Map project = gitService.createProject(token,gitProjectVo); + Map project = gitService.createProject(token, gitProjectVo); Integer gitlinIid = (Integer) project.get("id"); if (gitlinIid == null) { throw new Exception("创建模型失败:" + project.get("message")); } // 创建分支 - gitService.createBranch(token,(String) userInfo.get("login"), repositoryName, modelsVo.getVersion(), "master"); - // 定义标签 标签1：ci4s_model 标签2：ModelTag 标签3：ModelType - gitService.createTopic(token,gitlinIid, "ci4s_model"); - gitService.createTopic(token,gitlinIid, "modeltag_" + modelsVo.getModelTag()); - gitService.createTopic(token,gitlinIid, "modeltype_" + modelsVo.getModelType()); + gitService.createBranch(token, (String) userInfo.get("login"), repositoryName, modelsVo.getVersion(), "master"); + // 定义标签 标签1：ci4s-model 标签2：ModelTag 标签3：ModelType + gitService.createTopic(token, gitlinIid, "ci4s-model"); + gitService.createTopic(token, gitlinIid, "modeltag-" + modelsVo.getModelTag()); + gitService.createTopic(token, gitlinIid, "modeltype-" + modelsVo.getModelType()); String branchName = modelsVo.getVersion(); String owner = (String) userInfo.get("login"); @@ -663,10 +659,6 @@ public class ModelsServiceImpl implements ModelsService { String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); -// String ci4sUsername = "chenzhihang"; -// String gitLinkUsername = "chenzhihang"; -// String gitLinkPassword = "czh19970311"; - Map userInfo = getUserInfo(ci4sUsername, gitLinkUsername, gitLinkPassword); String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier(); @@ -759,7 +751,6 @@ public class ModelsServiceImpl implements ModelsService { for (MultipartFile file : files) { // 构建objectName String username = SecurityUtils.getLoginUser().getUsername(); -// String username = "chenzhihang"; String fileName = file.getOriginalFilename(); String path = localPath + "/temp/" + username + "/models/" + uuid; long sizeInBytes = file.getSize(); @@ -824,19 +815,15 @@ public class ModelsServiceImpl implements ModelsService { String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); -// String ci4sUsername = "chenzhihang"; -// String gitLinkUsername = "chenzhihang"; -// String gitLinkPassword = "czh19970311"; - Map userInfo = getUserInfo(ci4sUsername, gitLinkUsername, gitLinkPassword); String token = (String) userInfo.get("token"); //拼接查询url String modelTagName = modelsVo.getModelTag(); String modelTypeName = modelsVo.getModelType(); - String topic_name = "ci4s_model"; - topic_name = StringUtils.isEmpty(modelTagName) ? topic_name : topic_name + ",modeltag_" + modelTypeName; - topic_name = StringUtils.isEmpty(modelTagName) ? topic_name : topic_name + ",modeltype_" + modelTypeName; + String topic_name = "ci4s-model"; + topic_name = StringUtils.isEmpty(modelTagName) ? topic_name : topic_name + ",modeltag-" + modelTypeName; + topic_name = StringUtils.isEmpty(modelTagName) ? topic_name : topic_name + ",modeltype-" + modelTypeName; String url = gitendpoint + "/api/users/" + userInfo.get("login") + "/projects.json?page=" + pageRequest.getPageNumber() + "&limit=" + pageRequest.getPageSize() + "&category=manage&topic_name=" + topic_name; @@ -866,9 +853,9 @@ public class ModelsServiceImpl implements ModelsService { //拼接查询url String modelTagName = modelsVo.getModelTag(); String modelTypeName = modelsVo.getModelType(); - String topic_name = "ci4s_model"; - topic_name = StringUtils.isEmpty(modelTagName) ? topic_name : topic_name + ",modeltag_" + modelTagName; - topic_name = StringUtils.isEmpty(modelTypeName) ? topic_name : topic_name + ",modeltype_" + modelTypeName; + String topic_name = "ci4s-model"; + topic_name = StringUtils.isEmpty(modelTagName) ? topic_name : topic_name + ",modeltag-" + modelTagName; + topic_name = StringUtils.isEmpty(modelTypeName) ? topic_name : topic_name + ",modeltype-" + modelTypeName; String url = gitendpoint + "/api/projects.json?user_id=" + userId + "&page=" + pageRequest.getPageNumber() + "&limit=" + pageRequest.getPageSize() + "&sort_by=praises_count&topic_name=" + topic_name; String name = modelsVo.getName(); @@ -886,7 +873,7 @@ public class ModelsServiceImpl implements ModelsService { @Override public List> getVersionList(String identifier, String owner) throws Exception { String token = gitService.checkoutToken(); - List> brancheList = gitService.getBrancheList(token,owner, identifier); + List> brancheList = gitService.getBrancheList(token, owner, identifier); return brancheList.stream() .filter(branch -> !"master".equals(branch.get("name"))) .collect(Collectors.toList()); @@ -898,9 +885,6 @@ public class ModelsServiceImpl implements ModelsService { String ci4sUsername = loginUser.getUsername(); String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); -// String ci4sUsername = "chenzhihang"; -// String gitLinkUsername = "chenzhihang"; -// String gitLinkPassword = "czh19970311"; if (StringUtils.isEmpty(version)) { List> versionList = this.getVersionList(identifier, owner); @@ -954,7 +938,7 @@ public class ModelsServiceImpl implements ModelsService { @Override public void deleteModel(Integer repoId, String identifier, String owner) throws Exception { String token = gitService.checkoutToken(); - gitService.deleteProject(token,owner, identifier); + gitService.deleteProject(token, owner, identifier); //删除模型依赖 modelDependency1Dao.deleteModel(repoId, identifier, owner, null); @@ -968,7 +952,7 @@ public class ModelsServiceImpl implements ModelsService { @Override public void deleteVersion(Integer repoId, String identifier, String owner, String version, String relativePath) throws Exception { String token = gitService.checkoutToken(); - gitService.deleteBranch(token,owner, identifier, version, localPath + relativePath); + gitService.deleteBranch(token, owner, identifier, version, localPath + relativePath); //删除模型依赖 modelDependency1Dao.deleteModel(repoId, identifier, owner, version); HashMap map = new HashMap<>(); @@ -995,19 +979,19 @@ public class ModelsServiceImpl implements ModelsService { topics.forEach(topic -> { String name = (String) topic.get("name"); if (name != null) { - if (name.startsWith("modeltag_")) { - newModelVo.setModelTag(name.substring("modeltag_".length())); - } else if (name.startsWith("modeltype_")) { - newModelVo.setModelType(name.substring("modeltype_".length())); - } - } + if (name.startsWith("modeltag-")) { + newModelVo.setModelTag(name.substring("modeltag-".length())); + } else if (name.startsWith("modeltype-")) { + newModelVo.setModelType(name.substring("modeltype-".length())); + } + } }); } - Map author = (Map) map.get("author"); - newModelVo.setCreateBy((String) author.get("name")); - newModelVo.setOwner((String) author.get("login")); + Map author = (Map) map.get("author"); + newModelVo.setCreateBy((String) author.get("name")); + newModelVo.setOwner((String) author.get("login")); + } } - } return newModelVos; } return new ArrayList<>(); @@ -1059,7 +1043,7 @@ public class ModelsServiceImpl implements ModelsService { } Map getUserInfo(String ci4sUsername, String gitLinkUsername, String gitLinkPassword) throws IOException { - Jedis jedis = new Jedis(redisHost,redisPort); + Jedis jedis = new Jedis(redisHost, redisPort); String userReq = jedis.get(ci4sUsername + "_gitUserInfo"); if (userReq == null) { gitService.login(gitLinkUsername, gitLinkPassword); 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 806ee48a..228f2877 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 @@ -93,10 +93,10 @@ public class NewDatasetServiceImpl implements NewDatasetService { // 创建分支 String branchName = datasetVo.getVersion(); gitService.createBranch(token,(String) userInfo.get("login"), repositoryName, branchName, "master"); - // 定义标签 标签1：ci4s_dataset 标签2：DataTag 标签3：DataType - gitService.createTopic(token,gitlinIid, "ci4s_dataset"); - gitService.createTopic(token,gitlinIid, "DataTag_" + datasetVo.getDataTag()); - gitService.createTopic(token, gitlinIid, "DataType_" + datasetVo.getDataType()); + // 定义标签 标签1：ci4s-dataset 标签2：DataTag 标签3：DataType + gitService.createTopic(token,gitlinIid, "ci4s-dataset"); + gitService.createTopic(token,gitlinIid, "datatag-" + datasetVo.getDataTag()); + gitService.createTopic(token, gitlinIid, "datatype-" + datasetVo.getDataType()); // 得到项目地址 String projectUrl = gitendpoint + "/" + (String) userInfo.get("login") + "/"+ repositoryName + ".git"; @@ -227,9 +227,9 @@ public class NewDatasetServiceImpl implements NewDatasetService { // 拼接查询url String datasetTagName = dataset.getDatasetTagName(); String datasetTypeName = dataset.getDatasetTypeName(); - String topic_name = "ci4s_dataset"; - topic_name = StringUtils.isEmpty(datasetTagName) ? topic_name : topic_name + ",datatag_" + datasetTagName; - topic_name = StringUtils.isEmpty(datasetTagName) ? topic_name : topic_name + ",datatype_" + datasetTypeName; + String topic_name = "ci4s-dataset"; + topic_name = StringUtils.isEmpty(datasetTagName) ? topic_name : topic_name + ",datatag-" + datasetTagName; + topic_name = StringUtils.isEmpty(datasetTagName) ? topic_name : topic_name + ",datatype-" + datasetTypeName; String url = gitendpoint + "/api/users/" + (String) userInfo.get("login") + "/projects.json?page=" + pageRequest.getPageNumber() + "&limit=" + pageRequest.getPageSize() + "&category=manage&topic_name=" + topic_name; String name = dataset.getName(); @@ -255,9 +255,9 @@ public class NewDatasetServiceImpl implements NewDatasetService { // 拼接查询url String datasetTagName = dataset.getDatasetTagName(); String datasetTypeName = dataset.getDatasetTypeName(); - String topic_name = "ci4s_dataset"; - topic_name = StringUtils.isEmpty(datasetTagName) ? topic_name : topic_name + ",datatag_" + datasetTagName; - topic_name = StringUtils.isEmpty(datasetTagName) ? topic_name : topic_name + ",datatype_" + datasetTypeName; + String topic_name = "ci4s-dataset"; + topic_name = StringUtils.isEmpty(datasetTagName) ? topic_name : topic_name + ",datatag-" + datasetTagName; + topic_name = StringUtils.isEmpty(datasetTagName) ? topic_name : topic_name + ",datatype-" + datasetTypeName; String url = gitendpoint + "/api/projects.json?user_id=" + userId + "&page=" + pageRequest.getPageNumber() + "&limit=" + pageRequest.getPageSize() + "&sort_by=praises_count&topic_name=" + topic_name; String name = dataset.getName(); if (StringUtils.isNotEmpty(name)){ @@ -436,20 +436,20 @@ public class NewDatasetServiceImpl implements NewDatasetService { topics.forEach(topic -> { String name = (String) topic.get("name"); if (name != null) { - if (name.startsWith("datatag_")) { - newDatasetVo.setDataTag(name.substring("datatag_".length())); - } else if (name.startsWith("datatype_")) { - newDatasetVo.setDataType(name.substring("datatype_".length())); - } - } + if (name.startsWith("datatag-")) { + newDatasetVo.setDataTag(name.substring("datatag-".length())); + } else if (name.startsWith("datatype-")) { + newDatasetVo.setDataType(name.substring("datatype-".length())); + } + } }); } - Map author = (Map) map.get("author"); - newDatasetVo.setCreateBy((String) author.get("name")); - newDatasetVo.setOwner((String) author.get("login")); + Map author = (Map) map.get("author"); + newDatasetVo.setCreateBy((String) author.get("name")); + newDatasetVo.setOwner((String) author.get("login")); + } } - } return newDatasetVos; }