feat(task-retry): 失败任务克隆重试,最多 3 代并跳过欠费/宕机
- 废弃只复制 request_json 的空壳续跑:三类任务的解析输入都在模块侧状态里, 线上历史 19 条续跑因此全部失败;改为由 ClientTaskRetrySpi 克隆任务头 + 采集明细 / 解析 scope state / 源结果行,新任务直接可执行。 - 不可抗力不重试:LLM 密钥或代理 IP 欠费、服务宕机、账号自动登录失败。 - 新增内部回填端点 POST /api/internal/tasks/retry-failed(内部令牌, dryRun 默认 true),用于补扫 30 分钟窗口之外的历史失败。
This commit is contained in:
+6
@@ -5,10 +5,16 @@ import com.nanri.aiimage.modules.collectdata.model.entity.CollectDataItemEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface CollectDataItemMapper extends BaseMapper<CollectDataItemEntity> {
|
||||
|
||||
int insertBatch(@Param("rows") List<CollectDataItemEntity> rows);
|
||||
|
||||
/** 失败任务重试:把原任务的明细行整体复制到新任务,避免重新解析源 Excel。 */
|
||||
int copyItemsForRetry(@Param("sourceTaskId") Long sourceTaskId,
|
||||
@Param("targetTaskId") Long targetTaskId,
|
||||
@Param("createdAt") LocalDateTime createdAt);
|
||||
}
|
||||
|
||||
+83
@@ -0,0 +1,83 @@
|
||||
package com.nanri.aiimage.modules.collectdata.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.modules.collectdata.mapper.CollectDataItemMapper;
|
||||
import com.nanri.aiimage.modules.collectdata.model.entity.CollectDataItemEntity;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.service.TaskRetryCloneSupport;
|
||||
import com.nanri.aiimage.modules.task.spi.ClientTaskRetrySpi;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 采集数据的失败重试:明细行已在解析阶段落库(biz_collect_data_item),直接复制到新任务,
|
||||
* 不重新解析源 Excel——源文件本地保留 24 小时后会被清理,重试不能依赖它。
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class CollectDataTaskRetrySpiImpl implements ClientTaskRetrySpi {
|
||||
|
||||
private final FileTaskMapper fileTaskMapper;
|
||||
private final CollectDataItemMapper collectDataItemMapper;
|
||||
private final TaskRetryCloneSupport cloneSupport;
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return CollectDataService.MODULE_TYPE;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Long cloneForRetry(FileTaskEntity original) {
|
||||
Long itemCount = collectDataItemMapper.selectCount(new LambdaQueryWrapper<CollectDataItemEntity>()
|
||||
.eq(CollectDataItemEntity::getTaskId, original.getId()));
|
||||
if (itemCount == null || itemCount <= 0) {
|
||||
log.warn("[collect-data][retry] 原任务没有可复制的明细行 taskId={}", original.getId());
|
||||
return null;
|
||||
}
|
||||
int totalRows = itemCount > Integer.MAX_VALUE ? Integer.MAX_VALUE : itemCount.intValue();
|
||||
String resultJson = initialStatsJson(totalRows);
|
||||
FileTaskEntity child = cloneSupport.buildChild(original, resultJson);
|
||||
fileTaskMapper.insert(child);
|
||||
|
||||
int copied = collectDataItemMapper.copyItemsForRetry(
|
||||
original.getId(), child.getId(), LocalDateTime.now());
|
||||
if (copied != itemCount.intValue()) {
|
||||
throw new IllegalStateException("采集明细复制数量不一致 source=" + itemCount + " copied=" + copied);
|
||||
}
|
||||
cloneSupport.copySourceResult(original.getId(), child.getId(), moduleType(), totalRows);
|
||||
log.info("[collect-data][retry] 已克隆任务 original={} new={} items={}",
|
||||
original.getId(), child.getId(), copied);
|
||||
return child.getId();
|
||||
}
|
||||
|
||||
/** 与解析落库时的初始统计同形状,让客户端从第 1 行重新跑而不是继承上次的进度。 */
|
||||
private String initialStatsJson(int totalRows) {
|
||||
Map<String, Object> stats = new LinkedHashMap<>();
|
||||
stats.put("totalRows", totalRows);
|
||||
stats.put("receivedRows", 0);
|
||||
stats.put("processedRows", 0);
|
||||
stats.put("currentChunkRows", 0);
|
||||
stats.put("dedupeFilteredCount", 0);
|
||||
stats.put("invalidFilteredCount", 0);
|
||||
stats.put("brandRejectedCount", 0);
|
||||
stats.put("brandQueryFailedCount", 0);
|
||||
stats.put("finalRowCount", 0);
|
||||
stats.put("summaries", java.util.List.of());
|
||||
try {
|
||||
return objectMapper.writeValueAsString(stats);
|
||||
} catch (Exception ex) {
|
||||
throw new IllegalStateException("序列化采集重试统计失败", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user