From e71711b4a0fddce9d40b8c242f040c8031641e48 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Mon, 1 Dec 2025 18:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/JenkinsJobServiceImpl.java   | 25 +++++++++++--
 .../service/impl/JenkinsViewServiceImpl.java  | 16 +++++++++
 .../impl/RepositoryBranchServiceImpl.java     | 36 +++++++++++++++++--
 .../impl/RepositoryGroupServiceImpl.java      | 16 +++++++++
 .../impl/RepositoryProjectServiceImpl.java    | 25 +++++++++++--
 frontend/.gitignore                           |  2 +-
 6 files changed, 112 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsJobServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsJobServiceImpl.java
index a5d9e0c0..dca05ad0 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsJobServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsJobServiceImpl.java
@@ -66,6 +66,9 @@ public class JenkinsJobServiceImpl extends BaseServiceImpl<JenkinsJob, JenkinsJo
     @Resource
     private com.qqchen.deploy.backend.deploy.repository.IJenkinsBuildRepository jenkinsBuildRepository;
 
+    @Resource
+    private com.qqchen.deploy.backend.deploy.lock.SyncLockManager syncLockManager;
+
     /**
      * 同步外部系统下所有视图的Jenkins任务（异步执行）
      *
@@ -75,7 +78,16 @@ public class JenkinsJobServiceImpl extends BaseServiceImpl<JenkinsJob, JenkinsJo
     @Async
     @Transactional(rollbackFor = Exception.class)
     public void syncJobs(Long externalSystemId) {
-        doSyncJobs(externalSystemId, null);
+        // 尝试获取锁（只使用 externalSystemId 作为锁参数）
+        if (!syncLockManager.tryLock(externalSystemId)) {
+            return;
+        }
+
+        try {
+            doSyncJobs(externalSystemId, null);
+        } finally {
+            syncLockManager.unlock(externalSystemId);
+        }
     }
 
     /**
@@ -88,7 +100,16 @@ public class JenkinsJobServiceImpl extends BaseServiceImpl<JenkinsJob, JenkinsJo
     @Async
     @Transactional(rollbackFor = Exception.class)
     public void syncJobs(Long externalSystemId, Long viewId) {
-        doSyncJobs(externalSystemId, viewId);
+        // 尝试获取锁（使用 externalSystemId 和 viewId 作为锁参数）
+        if (!syncLockManager.tryLock(externalSystemId, viewId)) {
+            return;
+        }
+
+        try {
+            doSyncJobs(externalSystemId, viewId);
+        } finally {
+            syncLockManager.unlock(externalSystemId, viewId);
+        }
     }
 
     /**
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsViewServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsViewServiceImpl.java
index 1b245d53..f9fbdd92 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsViewServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsViewServiceImpl.java
@@ -60,6 +60,9 @@ public class JenkinsViewServiceImpl extends BaseServiceImpl<JenkinsView, Jenkins
     @Resource
     private IJenkinsSyncHistoryService jenkinsSyncHistoryService;
 
+    @Resource
+    private com.qqchen.deploy.backend.deploy.lock.SyncLockManager syncLockManager;
+
     /**
      * 同步Jenkins视图（异步执行）
      *
@@ -69,6 +72,19 @@ public class JenkinsViewServiceImpl extends BaseServiceImpl<JenkinsView, Jenkins
     @Async
     @Transactional(rollbackFor = Exception.class)
     public void syncViews(Long externalSystemId) {
+        // 尝试获取锁
+        if (!syncLockManager.tryLock(externalSystemId)) {
+            return;
+        }
+
+        try {
+            doSyncViews(externalSystemId);
+        } finally {
+            syncLockManager.unlock(externalSystemId);
+        }
+    }
+
+    private void doSyncViews(Long externalSystemId) {
         // 1. 创建同步历史记录
         JenkinsSyncHistoryDTO syncHistory = new JenkinsSyncHistoryDTO();
         syncHistory.setExternalSystemId(externalSystemId);
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryBranchServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryBranchServiceImpl.java
index 7b6ceaf0..990b21d1 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryBranchServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryBranchServiceImpl.java
@@ -66,6 +66,9 @@ public class RepositoryBranchServiceImpl extends BaseServiceImpl<RepositoryBranc
     @Resource(name = "repositoryBranchExecutor")
     private ThreadPoolTaskExecutor executor;
 
+    @Resource
+    private com.qqchen.deploy.backend.deploy.lock.SyncLockManager syncLockManager;
+
     private static final int BATCH_SIZE = 50; // 减小批次大小，提高容错性
 
     private static final int MAX_RETRIES = 3;
@@ -193,21 +196,48 @@ public class RepositoryBranchServiceImpl extends BaseServiceImpl<RepositoryBranc
     @Async
     @Transactional(rollbackFor = Exception.class)
     public void syncBranches(Long externalSystemId) {
-        doSyncBranches(externalSystemId, null, null);
+        // 尝试获取锁
+        if (!syncLockManager.tryLock(externalSystemId)) {
+            return;
+        }
+
+        try {
+            doSyncBranches(externalSystemId, null, null);
+        } finally {
+            syncLockManager.unlock(externalSystemId);
+        }
     }
 
     @Override
     @Async
     @Transactional(rollbackFor = Exception.class)
     public void syncBranches(Long externalSystemId, Long repoGroupId) {
-        doSyncBranches(externalSystemId, repoGroupId, null);
+        // 尝试获取锁
+        if (!syncLockManager.tryLock(externalSystemId, repoGroupId)) {
+            return;
+        }
+
+        try {
+            doSyncBranches(externalSystemId, repoGroupId, null);
+        } finally {
+            syncLockManager.unlock(externalSystemId, repoGroupId);
+        }
     }
 
     @Override
     @Async
     @Transactional(rollbackFor = Exception.class)
     public void syncBranches(Long externalSystemId, Long repoGroupId, Long repoProjectId) {
-        doSyncBranches(externalSystemId, repoGroupId, repoProjectId);
+        // 尝试获取锁
+        if (!syncLockManager.tryLock(externalSystemId, repoGroupId, repoProjectId)) {
+            return;
+        }
+
+        try {
+            doSyncBranches(externalSystemId, repoGroupId, repoProjectId);
+        } finally {
+            syncLockManager.unlock(externalSystemId, repoGroupId, repoProjectId);
+        }
     }
 
     /**
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryGroupServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryGroupServiceImpl.java
index 92e5f8d9..a28354f7 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryGroupServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryGroupServiceImpl.java
@@ -60,10 +60,26 @@ public class RepositoryGroupServiceImpl extends BaseServiceImpl<RepositoryGroup,
     @Resource
     private IRepositorySyncHistoryService repositorySyncHistoryService;
 
+    @Resource
+    private com.qqchen.deploy.backend.deploy.lock.SyncLockManager syncLockManager;
+
     @Override
     @Async
     @Transactional(rollbackFor = Exception.class)
     public void syncGroups(Long externalSystemId) {
+        // 尝试获取锁
+        if (!syncLockManager.tryLock(externalSystemId)) {
+            return;
+        }
+
+        try {
+            doSyncGroups(externalSystemId);
+        } finally {
+            syncLockManager.unlock(externalSystemId);
+        }
+    }
+
+    private void doSyncGroups(Long externalSystemId) {
         // 1. 创建同步历史记录
         RepositorySyncHistoryDTO groupHistory = repositorySyncHistoryService.createSyncHistory(externalSystemId, RepositorySyncType.GROUP);
 
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryProjectServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryProjectServiceImpl.java
index bd7cd38b..1631ee88 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryProjectServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryProjectServiceImpl.java
@@ -76,6 +76,9 @@ public class RepositoryProjectServiceImpl extends BaseServiceImpl<RepositoryProj
     @Resource
     private IRepositorySyncHistoryService repositorySyncHistoryService;
 
+    @Resource
+    private com.qqchen.deploy.backend.deploy.lock.SyncLockManager syncLockManager;
+
     private static final int BATCH_SIZE = 100;
     private static final int MAX_RETRIES = 3;
     private static final long RETRY_DELAY = 100L;
@@ -111,14 +114,32 @@ public class RepositoryProjectServiceImpl extends BaseServiceImpl<RepositoryProj
     @Async
     @Transactional(rollbackFor = Exception.class)
     public void syncProjects(Long externalSystemId) {
-        doSyncProjects(externalSystemId, null);
+        // 尝试获取锁
+        if (!syncLockManager.tryLock(externalSystemId)) {
+            return;
+        }
+
+        try {
+            doSyncProjects(externalSystemId, null);
+        } finally {
+            syncLockManager.unlock(externalSystemId);
+        }
     }
 
     @Override
     @Async
     @Transactional(rollbackFor = Exception.class)
     public void syncProjects(Long externalSystemId, Long repoGroupId) {
-        doSyncProjects(externalSystemId, repoGroupId);
+        // 尝试获取锁
+        if (!syncLockManager.tryLock(externalSystemId, repoGroupId)) {
+            return;
+        }
+
+        try {
+            doSyncProjects(externalSystemId, repoGroupId);
+        } finally {
+            syncLockManager.unlock(externalSystemId, repoGroupId);
+        }
     }
 
     /**
diff --git a/frontend/.gitignore b/frontend/.gitignore
index 119e0626..d4740e21 100644
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -1,2 +1,2 @@
 ./dist/*
-./node_modules
\ No newline at end of file
+./node_modules