From 5d375b7783af45eec7264c4f0143a7db96e9a8c6 Mon Sep 17 00:00:00 2001
From: asp_ly <dengqichen@iscmtech.com>
Date: Mon, 30 Dec 2024 21:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=88=90=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=9C=8D=E5=8A=A1=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/JenkinsBuildServiceImpl.java | 17 +++---
 .../DeployNodeFormVariables.java              | 53 ++++++++++---------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java
index eeda3fec..be7ed460 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java
@@ -28,6 +28,7 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Instant;
@@ -75,7 +76,7 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional
     public Integer syncAllBuilds(Long externalSystemId) {
         // 1. 创建同步历史记录
         JenkinsSyncHistoryDTO syncHistory = new JenkinsSyncHistoryDTO();
@@ -120,7 +121,7 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
             }
             jenkinsSyncHistoryService.saveOrUpdateHistory(syncHistory);
 
-            log.info("Successfully synchronized total {} builds for external system: {}", 
+            log.info("Successfully synchronized total {} builds for external system: {}",
                 totalSyncedBuilds, externalSystemId);
             return totalSyncedBuilds;
         } catch (Exception e) {
@@ -175,7 +176,7 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     public Integer syncBuilds(ExternalSystem externalSystem, JenkinsJob job) {
         JenkinsJobResponse queryJob = jenkinsServiceIntegration.job(externalSystem, job.getJobName());
         if (queryJob == null || queryJob.getLastBuild() == null) {
@@ -216,7 +217,7 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
         // Batch save
         if (!jenkinsBuilds.isEmpty()) {
             jenkinsBuildRepository.saveAll(jenkinsBuilds);
-            
+
             // Update job's last build info
             job.setLastBuildNumber(queryJob.getLastBuild().getNumber());
             if (queryJob.getLastBuild().getTimestamp() != null) {
@@ -226,10 +227,10 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
                 ));
             }
             jenkinsJobRepository.save(job);
-            
+
             log.info("Successfully synchronized {} builds for job: {}", jenkinsBuilds.size(), job.getJobName());
         }
-        
+
         return jenkinsBuilds.size();
     }
 
@@ -240,7 +241,7 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
         jenkinsBuild.setBuildUrl(response.getUrl());
         jenkinsBuild.setBuildStatus(response.getResult());
         jenkinsBuild.setDuration(response.getDuration());
-        
+
         // 转换时间戳为LocalDateTime
         if (response.getTimestamp() != null) {
             LocalDateTime startTime = LocalDateTime.ofInstant(
@@ -249,7 +250,7 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
             );
             jenkinsBuild.setStarttime(startTime);
         }
-        
+
         // 将构建参数转换为JSON字符串
         try {
             String actionsJson = objectMapper.writeValueAsString(response.getActions());
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/fromVariables/DeployNodeFormVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/fromVariables/DeployNodeFormVariables.java
index a0f49443..3b84ecab 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/fromVariables/DeployNodeFormVariables.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/fromVariables/DeployNodeFormVariables.java
@@ -11,51 +11,56 @@ import lombok.EqualsAndHashCode;
 public class DeployNodeFormVariables extends BaseNodeFormVariables {
 
     @SchemaProperty(
-        title = "项目",
-        description = "选择项目",
+        title = "绑定三方Jenkins系统",
+        description = "请选择三方Jenkins系统",
         required = true,
         dataSource = @SchemaPropertyDataSource(
             type = "api",
-            url = "/api/v1/projects",
+            url = "/api/v1/external-system/list?type=JENKINS",
             valueField = "id",
             labelField = "name"
-        )
+        ),
+        order = 1
     )
-    private String projectId;
+    private String externalSystemId;
+
 
     @SchemaProperty(
-        title = "Jenkins视图",
-        description = "Jenkins视图名称",
+        title = "绑定Jenkins视图",
+        description = "Jenkins视图",
         required = true,
         dataSource = @SchemaPropertyDataSource(
             type = "api",
-            url = "/api/v1/jenkins/views",
-            valueField = "name",
-            labelField = "name",
-            dependsOn = {"projectId"},
+            url = "/api/v1/jenkins-view/list",
+            valueField = "id",
+            labelField = "viewName",
+            dependsOn = {"externalSystemId"},
             params = {
-                @SchemaPropertyDataSourceParam(name = "projectId", value = "${projectId}")
+                @SchemaPropertyDataSourceParam(name = "externalSystemId", value = "${externalSystemId}")
             }
-        )
+        ),
+        order = 2
     )
-    private String view;
+    private String viewId;
+
 
     @SchemaProperty(
-        title = "Jenkins任务",
-        description = "Jenkins任务名称",
+        title = "绑定Jenkins任务",
+        description = "Jenkins任务",
         required = true,
         dataSource = @SchemaPropertyDataSource(
             type = "api",
-            url = "/api/v1/jenkins/jobs",
-            valueField = "name",
-            labelField = "name",
-            dependsOn = {"projectId", "view"},
+            url = "/api/v1/jenkins-job/list",
+            valueField = "id",
+            labelField = "jobName",
+            dependsOn = {"externalSystemId", "viewId"},
             params = {
-                @SchemaPropertyDataSourceParam(name = "projectId", value = "${projectId}"),
-                @SchemaPropertyDataSourceParam(name = "view", value = "${view}")
+                @SchemaPropertyDataSourceParam(name = "externalSystemId", value = "${externalSystemId}"),
+                @SchemaPropertyDataSourceParam(name = "viewId", value = "${viewId}")
             }
-        )
+        ),
+        order = 3
     )
-    private String job;
+    private String jobId;
 
 }