From fc2e08578004b021aeed42f48da2c3e1469cf552 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Fri, 23 Aug 2024 15:07:04 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE):=20#5419=20?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=97=B6=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E4=BB=A3=E7=A0=81=E5=9D=97=EF=BC=8C=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=E7=9A=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/domain/vo/PmsProjectRepositorySearchVo.java | 3 +++ .../domain/vo/PmsProjectUnlinkedRepositorySearchVo.java | 3 +++ .../service/impl/PmsProjectRepositoryServiceImpl.java | 9 ++++++--- .../pms/repository/domain/PmsRepositorySearchVo.java | 5 +++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectRepositorySearchVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectRepositorySearchVo.java index 9a2a13fe5..7ebf65ad3 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectRepositorySearchVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectRepositorySearchVo.java @@ -40,6 +40,9 @@ public class PmsProjectRepositorySearchVo @NotNull private Long limit; + @ApiModelProperty(value = "是否导入成功 0未成功 1成功") + private Boolean actived; + public PmsProjectRepository toPmsProjectRepository() { PmsProjectRepository pmsProjectRepository = new PmsProjectRepository(); pmsProjectRepository.setPmsProjectId(pmsProjectId); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectUnlinkedRepositorySearchVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectUnlinkedRepositorySearchVo.java index d3663580b..69dfa0829 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectUnlinkedRepositorySearchVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectUnlinkedRepositorySearchVo.java @@ -28,4 +28,7 @@ public class PmsProjectUnlinkedRepositorySearchVo @ApiModelProperty(value = "每页数量") @NotNull private Long limit; + + @ApiModelProperty(value = "是否导入成功") + private Boolean actived; } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectRepositoryServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectRepositoryServiceImpl.java index b654d8aa1..748bd73a7 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectRepositoryServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectRepositoryServiceImpl.java @@ -90,7 +90,8 @@ public class PmsProjectRepositoryServiceImpl implements IPmsProjectRepositorySer pmsProjectRepositorySearchVo.getLimit(), pmsProjectRepositorySearchVo.getSortBy(), projectRepositoryIds, - null); + null, + pmsProjectRepositorySearchVo.getActived()); try { return gitLinkRequestHelper.doGet(PmsGitLinkRequestUrl.GET_ORGANIZATION_REPO_LIST(pmsProjectRepositorySearchVo.getEnterpriseIdentifier(), queryParams)); } catch (URISyntaxException e) { @@ -108,7 +109,8 @@ public class PmsProjectRepositoryServiceImpl implements IPmsProjectRepositorySer pmsProjectUnlinkedRepositorySearchVo.getLimit(), pmsProjectUnlinkedRepositorySearchVo.getSortBy(), null, - linkedRepositoryIdsString); + linkedRepositoryIdsString, + pmsProjectUnlinkedRepositorySearchVo.getActived()); try { return gitLinkRequestHelper.doGet(PmsGitLinkRequestUrl.GET_ORGANIZATION_REPO_LIST(pmsProjectUnlinkedRepositorySearchVo.getEnterpriseIdentifier(), queryParams)); } catch (URISyntaxException e) { @@ -187,13 +189,14 @@ public class PmsProjectRepositoryServiceImpl implements IPmsProjectRepositorySer private static Map convertToGetRepoListQueryParam(String search, @NotNull Long page, @NotNull Long limit, String sortBy, String projectRepositoryIds, - String linkedRepositoryIdsString) { + String linkedRepositoryIdsString, Boolean actived) { Map queryParams = new HashMap<>(); queryParams.put("search", search); queryParams.put("page" , String.valueOf(page)); queryParams.put("limit", String.valueOf(limit)); queryParams.put("sort_by", sortBy); queryParams.put("sort_direction", "desc"); + queryParams.put("actived", actived ? "true" : "false"); if (StringUtils.isNotEmpty(projectRepositoryIds)) { queryParams.put("pm_project_repository_ids", projectRepositoryIds); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/repository/domain/PmsRepositorySearchVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/repository/domain/PmsRepositorySearchVo.java index 522d83e90..04cd83b3a 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/repository/domain/PmsRepositorySearchVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/repository/domain/PmsRepositorySearchVo.java @@ -24,6 +24,8 @@ public class PmsRepositorySearchVo { private Long page; @ApiModelProperty(value = "每页数量") private Long limit; + @ApiModelProperty(value = "是否导入成功") + private Boolean actived; public String genQueryString() { StringBuilder stringBuilder = new StringBuilder("?"); @@ -41,6 +43,9 @@ public class PmsRepositorySearchVo { if (StringUtils.isNotEmpty(search)) { stringBuilder.append("&search=").append(search); } + if (actived != null) { + stringBuilder.append("&actived=").append(actived ? "true" : "false"); + } return stringBuilder.toString(); } }