提交打包

backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskCacheService.java

@@ -14,6 +14,7 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -79,6 +80,41 @@ public class QueryAsinTaskCacheService {
         }
     }
 
+    public Map<Long, Long> getTaskHeartbeatMillisBatch(List<Long> taskIds) {
+        Map<Long, Long> result = new LinkedHashMap<>();
+        if (taskIds == null || taskIds.isEmpty()) {
+            return result;
+        }
+        List<Long> normalized = taskIds.stream()
+                .filter(id -> id != null && id > 0)
+                .distinct()
+                .toList();
+        if (normalized.isEmpty()) {
+            return result;
+        }
+        List<String> keys = normalized.stream().map(this::buildTaskHeartbeatKey).toList();
+        List<String> values;
+        try {
+            values = stringRedisTemplate.opsForValue().multiGet(keys);
+        } catch (Exception ex) {
+            log.warn("[query-asin-cache] batch get heartbeat degraded taskIds={} msg={}", normalized, ex.getMessage());
+            return result;
+        }
+        for (int i = 0; i < normalized.size(); i++) {
+            String raw = values != null && i < values.size() ? values.get(i) : null;
+            if (raw == null || raw.isBlank()) {
+                result.put(normalized.get(i), 0L);
+                continue;
+            }
+            try {
+                result.put(normalized.get(i), Long.parseLong(raw));
+            } catch (NumberFormatException ignored) {
+                result.put(normalized.get(i), 0L);
+            }
+        }
+        return result;
+    }
+
     public void touchTaskHeartbeat(Long taskId) {
         try {
             stringRedisTemplate.opsForValue().set(

backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java

@@ -328,6 +328,7 @@ public class QueryAsinTaskService {
             throw new BusinessException("shops 不能为空");
         }
 
+        try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) {
         FileTaskEntity task = loadTaskForExecution(taskId);
         if (task == null || !MODULE_TYPE.equals(task.getModuleType())) {
             throw new BusinessException("任务不存在");
@@ -370,12 +371,19 @@ public class QueryAsinTaskService {
         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("[query-asin] 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;
@@ -446,6 +454,7 @@ public class QueryAsinTaskService {
         fileTaskMapper.updateById(task);
         taskCacheService.saveTaskCache(task);
         return changed;
+        }
     }
 
     @Transactional
@@ -455,11 +464,13 @@ public class QueryAsinTaskService {
         if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !userId.equals(task.getUserId())) {
             throw new BusinessException("任务不存在");
         }
+        try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) {
         fileResultMapper.delete(new LambdaQueryWrapper<FileResultEntity>()
                 .eq(FileResultEntity::getTaskId, taskId)
                 .eq(FileResultEntity::getModuleType, MODULE_TYPE));
         fileTaskMapper.deleteById(taskId);
         taskCacheService.deleteTaskCache(taskId);
+        }
     }
 
     @Transactional