Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '新建流水线时可选代码库，屏蔽导入失败的代码库' (#638) from dev_PMS into dev_PMS_ZPK

This commit is contained in:
wanjia9506 2024-08-23 15:08:29 +08:00
parent 10a36ee352 9f4805a839
commit f8ff23d023
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectRepositorySearchVo.java
View File

@ -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);

3
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectUnlinkedRepositorySearchVo.java
View File

@ -28,4 +28,7 @@ public class PmsProjectUnlinkedRepositorySearchVo
@ApiModelProperty(value = "每页数量")
@NotNull
private Long limit;
@ApiModelProperty(value = "是否导入成功")
private Boolean actived;
}

9
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectRepositoryServiceImpl.java
View File

@ -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<String, String> convertToGetRepoListQueryParam(String search, @NotNull Long page, @NotNull Long limit,
String sortBy, String projectRepositoryIds,
String linkedRepositoryIdsString) {
String linkedRepositoryIdsString, Boolean actived) {
Map<String, String> 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);
}

5
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/repository/domain/PmsRepositorySearchVo.java
View File

@ -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();
}
}