diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java index aa3ec74b..6bd90437 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java @@ -120,4 +120,7 @@ public interface ModelsService { String praise(Integer id) throws Exception; String unpraise(Integer id) throws Exception; + + List convert(List> lst, String modelTopic, String modelTagName, String modelTypeName); + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewDatasetService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewDatasetService.java index a1116105..5d280066 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewDatasetService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/NewDatasetService.java @@ -42,4 +42,6 @@ public interface NewDatasetService { Map getVersionsCompare(QueryModelMetricsVo querydatasetVo) throws Exception; String newCreateVersionFromLabelStudio(LabelDatasetVersionVo datasetVo) throws Exception; + + List convert(List> lst, String datasetTopic, String datasetTagName, String datasetTypeName); } 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 a82d85d4..93566d06 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 @@ -1249,6 +1249,7 @@ public class ModelsServiceImpl implements ModelsService { return "取消点赞成功"; } + @Override public List convert(List> lst, String modelTopic, String modelTagName, String modelTypeName) { if (lst != null && lst.size() > 0) { List result = new ArrayList<>(); 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 55f692e9..d0293440 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 @@ -610,7 +610,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { } - + @Override public List convert(List> lst, String datasetTopic, String datasetTagName, String datasetTypeName) { if (lst != null && lst.size() > 0) { List result = new ArrayList<>(); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java index 87560cc6..bf39a654 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java @@ -3,12 +3,12 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.platform.domain.*; import com.ruoyi.platform.mapper.*; -import com.ruoyi.platform.service.ExperimentInsService; -import com.ruoyi.platform.service.GitService; -import com.ruoyi.platform.service.WorkspaceService; +import com.ruoyi.platform.service.*; import com.ruoyi.platform.utils.JacksonUtil; import com.ruoyi.platform.utils.JsonUtils; import com.ruoyi.platform.utils.NewHttpUtils; +import com.ruoyi.platform.vo.ModelsVo; +import com.ruoyi.platform.vo.NewDatasetVo; import com.ruoyi.system.api.constant.Constant; import com.ruoyi.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Value; @@ -32,16 +32,16 @@ public class WorkspaceServiceImpl implements WorkspaceService { @Resource private ExperimentInsService experimentInsService; @Resource - private ModelsDao modelsDao; - @Resource - private DatasetDao datasetDao; - @Resource private ImageDao imageDao; @Resource private ComponentDao componentDao; @Resource private GitService gitService; @Resource + private NewDatasetService newDatasetService; + @Resource + private ModelsService modelsService; + @Resource private NewHttpUtils httpUtils; @Value("${git.endpoint}") @@ -114,13 +114,15 @@ public class WorkspaceServiceImpl implements WorkspaceService { String req = httpUtils.sendGetWithToken(url, null, token); Map stringObjectMap = JacksonUtil.parseJSONStr2Map(req); List> projects = (List>) stringObjectMap.get("projects"); - assetCountMap.put("dataset", projects.size()); + List collect1 = newDatasetService.convert(projects, Constant.Topic_Dataset, null, null); + assetCountMap.put("dataset", collect1.size()); url = gitendpoint + "/api/users/" + userInfo.get("login") + "/projects.json?category=manage"; req = httpUtils.sendGetWithToken(url, null, token); stringObjectMap = JacksonUtil.parseJSONStr2Map(req); projects = (List>) stringObjectMap.get("projects"); - assetCountMap.put("model", projects.size()); + List collect2 = modelsService.convert(projects, Constant.Topic_model, null, null); + assetCountMap.put("model", collect2.size()); } // 镜像