From a8d3662e1c6a234eaea54d3b6a04a0a139f14bb1 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Mon, 30 Dec 2024 18:45:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=A3=B0=E9=81=93=E6=92=92=E6=97=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../variables/JenkinsBaseBuildVariables.java  | 22 +++++++++----------
 .../backend/deploy/query/JenkinsJobQuery.java |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/variables/JenkinsBaseBuildVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/variables/JenkinsBaseBuildVariables.java
index a1fc6242..4c9802f5 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/variables/JenkinsBaseBuildVariables.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/variables/JenkinsBaseBuildVariables.java
@@ -14,8 +14,8 @@ public class JenkinsBaseBuildVariables {
 
 
     @SchemaProperty(
-        title = "绑定三方Jenkins",
-        description = "请选择三方Jenkins",
+        title = "绑定三方Jenkins系统",
+        description = "请选择三方Jenkins系统",
         required = true,
         dataSource = @SchemaPropertyDataSource(
             type = "api",
@@ -30,12 +30,12 @@ public class JenkinsBaseBuildVariables {
 
     @SchemaProperty(
         title = "绑定Jenkins视图",
-        description = "Jenkins视图名称",
+        description = "Jenkins视图",
         required = true,
         dataSource = @SchemaPropertyDataSource(
             type = "api",
             url = "/api/v1/jenkins-view/list",
-            valueField = "viewName",
+            valueField = "id",
             labelField = "viewName",
             dependsOn = {"externalSystemId"},
             params = {
@@ -44,31 +44,31 @@ public class JenkinsBaseBuildVariables {
         ),
         order = 2
     )
-    private String jenkinsViewName;
+    private String viewId;
 
 
     @SchemaProperty(
         title = "绑定Jenkins任务",
-        description = "Jenkins任务名称",
+        description = "Jenkins任务",
         required = true,
         dataSource = @SchemaPropertyDataSource(
             type = "api",
             url = "/api/v1/jenkins-job/list",
-            valueField = "jobName",
+            valueField = "id",
             labelField = "jobName",
-            dependsOn = {"projectId", "viewName"},
+            dependsOn = {"externalSystemId", "viewId"},
             params = {
                 @SchemaPropertyDataSourceParam(name = "externalSystemId", value = "${externalSystemId}"),
-                @SchemaPropertyDataSourceParam(name = "viewName", value = "${viewName}")
+                @SchemaPropertyDataSourceParam(name = "viewId", value = "${viewId}")
             }
         ),
         order = 3
     )
-    private String jenkinsJobName;
+    private String jobId;
 
     @SchemaProperty(
         title = "分支名称",
-        description = "Git分支名称",
+        description = "GIT分支名称",
         required = true,
         order = 4
     )
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/JenkinsJobQuery.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/JenkinsJobQuery.java
index 4a2e3d44..85d554e0 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/JenkinsJobQuery.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/JenkinsJobQuery.java
@@ -41,10 +41,10 @@ public class JenkinsJobQuery extends BaseQuery {
     @QueryField(field = "last_build_time")
     private LocalDateTime lastBuildTime;
 
-    @QueryField(field = "external_system_id")
+    @QueryField(field = "externalSystemId")
     private Long externalSystemId;
 
-    @QueryField(field = "view_id")
+    @QueryField(field = "viewId", type = QueryType.EQUAL)
     private Long viewId;
 
 } 
\ No newline at end of file