大声道撒旦

This commit is contained in:
dengqichen 2024-12-30 18:45:57 +08:00
parent e9eb0d0b82
commit a8d3662e1c
2 changed files with 13 additions and 13 deletions

View File

@ -14,8 +14,8 @@ public class JenkinsBaseBuildVariables {
@SchemaProperty( @SchemaProperty(
title = "绑定三方Jenkins", title = "绑定三方Jenkins系统",
description = "请选择三方Jenkins", description = "请选择三方Jenkins系统",
required = true, required = true,
dataSource = @SchemaPropertyDataSource( dataSource = @SchemaPropertyDataSource(
type = "api", type = "api",
@ -30,12 +30,12 @@ public class JenkinsBaseBuildVariables {
@SchemaProperty( @SchemaProperty(
title = "绑定Jenkins视图", title = "绑定Jenkins视图",
description = "Jenkins视图名称", description = "Jenkins视图",
required = true, required = true,
dataSource = @SchemaPropertyDataSource( dataSource = @SchemaPropertyDataSource(
type = "api", type = "api",
url = "/api/v1/jenkins-view/list", url = "/api/v1/jenkins-view/list",
valueField = "viewName", valueField = "id",
labelField = "viewName", labelField = "viewName",
dependsOn = {"externalSystemId"}, dependsOn = {"externalSystemId"},
params = { params = {
@ -44,31 +44,31 @@ public class JenkinsBaseBuildVariables {
), ),
order = 2 order = 2
) )
private String jenkinsViewName; private String viewId;
@SchemaProperty( @SchemaProperty(
title = "绑定Jenkins任务", title = "绑定Jenkins任务",
description = "Jenkins任务名称", description = "Jenkins任务",
required = true, required = true,
dataSource = @SchemaPropertyDataSource( dataSource = @SchemaPropertyDataSource(
type = "api", type = "api",
url = "/api/v1/jenkins-job/list", url = "/api/v1/jenkins-job/list",
valueField = "jobName", valueField = "id",
labelField = "jobName", labelField = "jobName",
dependsOn = {"projectId", "viewName"}, dependsOn = {"externalSystemId", "viewId"},
params = { params = {
@SchemaPropertyDataSourceParam(name = "externalSystemId", value = "${externalSystemId}"), @SchemaPropertyDataSourceParam(name = "externalSystemId", value = "${externalSystemId}"),
@SchemaPropertyDataSourceParam(name = "viewName", value = "${viewName}") @SchemaPropertyDataSourceParam(name = "viewId", value = "${viewId}")
} }
), ),
order = 3 order = 3
) )
private String jenkinsJobName; private String jobId;
@SchemaProperty( @SchemaProperty(
title = "分支名称", title = "分支名称",
description = "Git分支名称", description = "GIT分支名称",
required = true, required = true,
order = 4 order = 4
) )

View File

@ -41,10 +41,10 @@ public class JenkinsJobQuery extends BaseQuery {
@QueryField(field = "last_build_time") @QueryField(field = "last_build_time")
private LocalDateTime lastBuildTime; private LocalDateTime lastBuildTime;
@QueryField(field = "external_system_id") @QueryField(field = "externalSystemId")
private Long externalSystemId; private Long externalSystemId;
@QueryField(field = "view_id") @QueryField(field = "viewId", type = QueryType.EQUAL)
private Long viewId; private Long viewId;
} }