提交打包

backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteTaskService.java

@@ -330,6 +330,7 @@ public class PatrolDeleteTaskService {
             throw new BusinessException("shops 不能为空");
         }
 
+        try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) {
         FileTaskEntity task = loadTaskForExecution(taskId);
         if (task == null || !MODULE_TYPE.equals(task.getModuleType())) {
             log.info("[patrol-delete] ignore result callback for deleted task taskId={}", taskId);
@@ -373,12 +374,19 @@ public class PatrolDeleteTaskService {
         fileTaskMapper.updateById(task);
         taskCacheService.saveTaskCache(task);
         tryFinalizeTask(taskId, false);
+        }
     }
 
     public boolean tryFinalizeTask(Long taskId, boolean fromCompensation) {
         if (taskId == null || taskId <= 0) {
             return false;
         }
+        TaskDistributedLockService.LockHandle lockHandle = acquireTaskLock(taskId);
+        if (lockHandle == null) {
+            log.info("[patrol-delete] tryFinalizeTask skipped because task lock is busy taskId={} fromCompensation={}", taskId, fromCompensation);
+            return false;
+        }
+        try (lockHandle) {
         FileTaskEntity task = loadTaskForExecution(taskId);
         if (task == null || !MODULE_TYPE.equals(task.getModuleType())) {
             return false;
@@ -449,6 +457,7 @@ public class PatrolDeleteTaskService {
         fileTaskMapper.updateById(task);
         taskCacheService.saveTaskCache(task);
         return changed;
+        }
     }
 
     @Transactional
@@ -459,6 +468,7 @@ public class PatrolDeleteTaskService {
         if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !userId.equals(task.getUserId())) {
             throw new BusinessException("任务不存在");
         }
+        try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) {
         long taskLoadedAt = System.nanoTime();
         fileResultMapper.delete(new LambdaQueryWrapper<FileResultEntity>()
                 .eq(FileResultEntity::getTaskId, taskId)
@@ -479,6 +489,7 @@ public class PatrolDeleteTaskService {
                 elapsedMs(resultsDeletedAt, auxiliaryDeletedAt),
                 elapsedMs(auxiliaryDeletedAt, taskDeletedAt),
                 elapsedMs(taskDeletedAt, finishedAt));
+        }
     }
 
     @Transactional