fix(backlog): 品牌出口统一、join 截止与进行中任务补回

- BrandLabel 出口守卫扩到全仓 entity.setBrand,撞款/去重/品牌库统一清洗
- FutureDeadline 替换五处无界 join,回传口锁等待降为 1s
- 采集/跟价/外观专利 history 补回窗口外进行中与续跑任务
- 工作台客户端版本强制单调;catch 棘轮按新增出口逐处记名
This commit is contained in:
2026-10-25 13:27:46 +08:00
parent 1dd9e66d21
commit 5928072c6a
30 changed files with 558 additions and 75 deletions
@@ -702,15 +702,60 @@ public class CollectDataService extends AbstractFileTaskPipeline<CollectDataResu
.eq(FileResultEntity::getUserId, userId)
.orderByDesc(FileResultEntity::getCreatedAt)
.last("limit " + safeLimit));
if (rows == null || rows.isEmpty()) {
return vo;
}
List<Long> taskIds = rows.stream().map(FileResultEntity::getTaskId).filter(Objects::nonNull).distinct().toList();
List<Long> taskIds = rows == null ? List.of() : rows.stream()
.map(FileResultEntity::getTaskId).filter(Objects::nonNull).distinct().toList();
Map<Long, FileTaskEntity> taskMap = loadTaskMap(taskIds);
for (FileResultEntity row : rows) {
FileTaskEntity task = row.getTaskId() == null ? null : taskMap.get(row.getTaskId());
vo.getItems().add(toHistoryItem(row, task));
if (rows != null) {
for (FileResultEntity row : rows) {
FileTaskEntity task = row.getTaskId() == null ? null : taskMap.get(row.getTaskId());
vo.getItems().add(toHistoryItem(row, task));
}
}
prependActiveTasksOutsideWindow(vo, userId, taskIds);
return vo;
}
/**
* 结果行被 top-N 窗口挤出后,仍在执行/排队中的任务会从列表彻底消失(页面重载即无兜底)。
* 这里按任务头补回最前面;已有结果行的任务不重复补。
*/
private void prependActiveTasksOutsideWindow(CollectDataHistoryVo vo, Long userId, List<Long> coveredTaskIds) {
List<FileTaskEntity> activeTasks = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
.select(FileTaskEntity::getId,
FileTaskEntity::getTaskNo,
FileTaskEntity::getStatus,
FileTaskEntity::getErrorMessage,
FileTaskEntity::getResumeOfTaskId,
FileTaskEntity::getRequestJson,
FileTaskEntity::getResultJson,
FileTaskEntity::getCreatedAt,
FileTaskEntity::getFinishedAt)
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
.eq(FileTaskEntity::getUserId, userId)
.in(FileTaskEntity::getStatus, List.of(STATUS_PENDING, STATUS_RUNNING))
.orderByDesc(FileTaskEntity::getCreatedAt)
.last("limit 50"));
if (activeTasks == null || activeTasks.isEmpty()) {
return;
}
List<CollectDataHistoryItemVo> activeItems = new ArrayList<>();
for (FileTaskEntity task : activeTasks) {
if (task == null || task.getId() == null || coveredTaskIds.contains(task.getId())) {
continue;
}
activeItems.add(toActiveHistoryItem(task));
}
if (!activeItems.isEmpty()) {
vo.getItems().addAll(0, activeItems);
}
}
private CollectDataHistoryItemVo toActiveHistoryItem(FileTaskEntity task) {
CollectDataHistoryItemVo vo = new CollectDataHistoryItemVo();
vo.setTaskId(task.getId());
vo.setSuccess(false);
vo.setError(task.getErrorMessage());
fillTaskHistoryFields(vo, task);
return vo;
}
@@ -1745,31 +1790,35 @@ public class CollectDataService extends AbstractFileTaskPipeline<CollectDataResu
vo.setError(row.getErrorMessage());
vo.setCreatedAt(formatTime(row.getCreatedAt()));
if (task != null) {
CollectDataStats stats = loadStats(task);
vo.setTaskNo(task.getTaskNo());
vo.setTaskStatus(task.getStatus());
vo.setStartedAt(formatTime(task.getCreatedAt()));
vo.setFinishedAt(formatTime(task.getFinishedAt()));
vo.setTaskType(extractTaskTypeFromRequest(task));
vo.setFilters(extractFiltersFromRequest(task));
vo.setDedupeFilteredCount(stats.dedupeFilteredCount);
vo.setInvalidFilteredCount(stats.invalidFilteredCount);
vo.setBrandRejectedCount(stats.brandRejectedCount);
vo.setFinalRowCount(stats.finalRowCount);
vo.setTotalRows(stats.totalRows);
vo.setReceivedRows(stats.receivedRows);
vo.setProcessedRows(stats.processedRows);
vo.setCollectStage(stats.collectStage);
vo.setCurrentKeyword(stats.currentKeyword);
vo.setSearchCurrentPage(stats.searchCurrentPage);
vo.setSearchTotalPages(stats.searchTotalPages);
vo.setDetailProcessedAsins(stats.detailProcessedAsins);
vo.setDetailTotalAsins(stats.detailTotalAsins);
vo.setProgressPercent(calculateProgressPercent(task.getStatus(), stats.totalRows, stats.processedRows));
fillTaskHistoryFields(vo, task);
}
return vo;
}
private void fillTaskHistoryFields(CollectDataHistoryItemVo vo, FileTaskEntity task) {
CollectDataStats stats = loadStats(task);
vo.setTaskNo(task.getTaskNo());
vo.setTaskStatus(task.getStatus());
vo.setStartedAt(formatTime(task.getCreatedAt()));
vo.setFinishedAt(formatTime(task.getFinishedAt()));
vo.setTaskType(extractTaskTypeFromRequest(task));
vo.setFilters(extractFiltersFromRequest(task));
vo.setDedupeFilteredCount(stats.dedupeFilteredCount);
vo.setInvalidFilteredCount(stats.invalidFilteredCount);
vo.setBrandRejectedCount(stats.brandRejectedCount);
vo.setFinalRowCount(stats.finalRowCount);
vo.setTotalRows(stats.totalRows);
vo.setReceivedRows(stats.receivedRows);
vo.setProcessedRows(stats.processedRows);
vo.setCollectStage(stats.collectStage);
vo.setCurrentKeyword(stats.currentKeyword);
vo.setSearchCurrentPage(stats.searchCurrentPage);
vo.setSearchTotalPages(stats.searchTotalPages);
vo.setDetailProcessedAsins(stats.detailProcessedAsins);
vo.setDetailTotalAsins(stats.detailTotalAsins);
vo.setProgressPercent(calculateProgressPercent(task.getStatus(), stats.totalRows, stats.processedRows));
}
private int calculateProgressPercent(String status, int totalRows, int receivedRows) {
if (STATUS_SUCCESS.equals(status)) {
return 100;