更新外观模块

backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/controller/PatrolDeleteController.java

@@ -155,8 +155,10 @@ public class PatrolDeleteController {
     @Operation(summary = "查询任务记录", description = "返回当前用户在巡店删除模块中的当前任务和历史任务记录。")
     public ApiResponse<PatrolDeleteHistoryVo> history(
             @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
-            @RequestParam("user_id") Long userId) {
-        return ApiResponse.success(patrolDeleteTaskService.listHistory(userId));
+            @RequestParam("user_id") Long userId,
+            @Parameter(description = "history limit, default 30, max 100", example = "30")
+            @RequestParam(value = "limit", required = false) Integer limit) {
+        return ApiResponse.success(patrolDeleteTaskService.listHistory(userId, limit));
     }
 
     @PostMapping("/tasks/progress/batch")

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

@@ -25,6 +25,7 @@ import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
 import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
 import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
 import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
+import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
 import com.nanri.aiimage.modules.task.service.TaskFileJobService;
 import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
 import com.nanri.aiimage.modules.task.service.TaskResultItemService;
@@ -68,6 +69,7 @@ public class PatrolDeleteTaskService {
     private final TaskResultItemService taskResultItemService;
     private final TaskProgressSnapshotService taskProgressSnapshotService;
     private final TaskScopePayloadStorageService taskScopePayloadStorageService;
+    private final TaskDistributedLockService taskDistributedLockService;
 
     private FileTaskEntity loadTaskForExecution(Long taskId) {
         Map<Long, FileTaskEntity> cachedTasks = taskCacheService.getTaskCacheBatch(List.of(taskId));
@@ -137,8 +139,13 @@ public class PatrolDeleteTaskService {
     }
 
     public PatrolDeleteHistoryVo listHistory(Long userId) {
+        return listHistory(userId, null);
+    }
+
+    public PatrolDeleteHistoryVo listHistory(Long userId, Integer limit) {
         long startedAt = System.nanoTime();
         validateUserId(userId);
+        int normalizedLimit = normalizeHistoryLimit(limit);
         PatrolDeleteHistoryVo vo = new PatrolDeleteHistoryVo();
         List<FileResultEntity> entities = fileResultMapper.selectList(new LambdaQueryWrapper<FileResultEntity>()
                 .select(FileResultEntity::getId,
@@ -155,7 +162,8 @@ public class PatrolDeleteTaskService {
                 .eq(FileResultEntity::getModuleType, MODULE_TYPE)
                 .eq(FileResultEntity::getUserId, userId)
                 .orderByDesc(FileResultEntity::getCreatedAt)
-                .last("limit 100"));
+                .orderByDesc(FileResultEntity::getId)
+                .last("limit " + normalizedLimit));
         long resultRowsLoadedAt = System.nanoTime();
         if (entities.isEmpty()) {
             vo.setItems(List.of());
@@ -481,9 +489,20 @@ public class PatrolDeleteTaskService {
             throw new BusinessException("记录不存在");
         }
         Long taskId = entity.getTaskId();
-        fileResultMapper.deleteById(resultId);
-        cleanupResultAuxiliaryDataFast(taskId, resultId);
-        reconcileTaskAfterResultRemoval(taskId);
+        if (taskId == null || taskId <= 0) {
+            fileResultMapper.deleteById(resultId);
+            cleanupResultAuxiliaryDataFast(taskId, resultId);
+            return;
+        }
+        try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) {
+            FileResultEntity latestEntity = fileResultMapper.selectById(resultId);
+            if (latestEntity == null || !MODULE_TYPE.equals(latestEntity.getModuleType()) || !userId.equals(latestEntity.getUserId())) {
+                throw new BusinessException("record not found");
+            }
+            fileResultMapper.deleteById(resultId);
+            cleanupResultAuxiliaryDataFast(taskId, resultId);
+            reconcileTaskAfterResultRemoval(taskId);
+        }
     }
 
     private void reconcileTaskAfterResultRemoval(Long taskId) {
@@ -560,6 +579,13 @@ public class PatrolDeleteTaskService {
         return payloadByShop;
     }
 
+    private int normalizeHistoryLimit(Integer limit) {
+        if (limit == null || limit <= 0) {
+            return 30;
+        }
+        return Math.min(limit, 100);
+    }
+
     private Map<Long, FileTaskEntity> loadTaskMap(List<FileResultEntity> entities) {
         List<Long> taskIds = entities.stream()
                 .map(FileResultEntity::getTaskId)
@@ -760,6 +786,9 @@ public class PatrolDeleteTaskService {
         long successCount = rows.stream().filter(row -> Integer.valueOf(RESULT_SUCCESS).equals(row.getSuccess())).count();
         long failedCount = rows.stream().filter(row -> Integer.valueOf(RESULT_FAILED).equals(row.getSuccess())).count();
         long pendingCount = rows.stream().filter(row -> !isResultFinished(row)).count();
+        if (pendingCount == 0 && successCount > 0 && isTaskWorkbookPending(task, rows)) {
+            pendingCount = 1;
+        }
         task.setSuccessFileCount((int) successCount);
         task.setFailedFileCount((int) failedCount);
         task.setUpdatedAt(LocalDateTime.now());
@@ -975,11 +1004,47 @@ public class PatrolDeleteTaskService {
                     fileResultMapper.updateById(row);
                 }
             }
+            updateTaskStatusFromRows(task, rows);
+            persistSnapshotJson(task, buildSnapshotFromDb(task, rows));
+            fileTaskMapper.updateById(task);
         } finally {
             FileUtil.del(xlsx);
         }
     }
 
+    private boolean isTaskWorkbookPending(FileTaskEntity task, List<FileResultEntity> rows) {
+        if (task == null || task.getId() == null || rows == null || rows.isEmpty()) {
+            return false;
+        }
+        FileResultEntity firstSuccess = rows.stream()
+                .filter(row -> Integer.valueOf(RESULT_SUCCESS).equals(row.getSuccess()))
+                .findFirst()
+                .orElse(null);
+        if (firstSuccess == null) {
+            return false;
+        }
+        if (!blank(firstSuccess.getResultFileUrl())) {
+            return false;
+        }
+        TaskFileJobEntity job = taskFileJobService.findAssembleJob(task.getId(), MODULE_TYPE, firstSuccess.getId());
+        return job != null && !"SUCCESS".equals(job.getStatus());
+    }
+
+    private TaskDistributedLockService.LockHandle acquireTaskLockOrThrow(Long taskId) {
+        TaskDistributedLockService.LockHandle lockHandle = acquireTaskLock(taskId);
+        if (lockHandle == null) {
+            throw new BusinessException(40901, "浠诲姟姝ｅ湪澶勭悊涓紝璇风◢鍚庡啀璇?");
+        }
+        return lockHandle;
+    }
+
+    private TaskDistributedLockService.LockHandle acquireTaskLock(Long taskId) {
+        if (taskId == null || taskId <= 0) {
+            return null;
+        }
+        return taskDistributedLockService.acquire(MODULE_TYPE, taskId);
+    }
+
     private void markResultSuccess(FileResultEntity row) {
         row.setSuccess(RESULT_SUCCESS);
         row.setErrorMessage(null);