fix(phase-6): 整量回归 7 红逐条闭环——锁跳过出口/RawExceptionSink/归属出口真修+四处台账点名登记

This commit is contained in:
2026-11-14 13:16:01 +08:00
parent ff859d25bc
commit edeffc26c4
6 changed files with 31 additions and 6 deletions
@@ -120,6 +120,10 @@ public class ApiGuardCoverageAuditor implements SmartInitializingSingleton {
* <li>{@code /api/delete-brand} —— 删品牌任务单,与已在名单里的 /api/brand 同形状,等同一批客户端</li>
* <li>{@code /api/module-templates} —— 模板列表按 user_id 取,匿名可读他人模板</li>
* <li>{@code /api/split} —— 拆合单任务,随 /api/convert 那批一起收</li>
* <li>{@code /api/jd-collect} —— v1.4 京东采集任务面(建单/chunk 回传/心跳):建单方法体已有
* requireOwnershipUserId(fail-closed 401),chunk 与 heartbeat 和 collect-data/delete-brand
* 同形状(本机桌面执行器不带凭据,行归属以任务 owner 投影);chunk 的 error 上报已接整单
* 判死,其 owner 对撞收口随 v1.4 Phase 6.1 落,判死口凭据化后随统一批进名单</li>
* </ul>
*/
static final Set<String> PENDING_CONVERGENCE = Set.of(
@@ -128,7 +132,8 @@ public class ApiGuardCoverageAuditor implements SmartInitializingSingleton {
"/api/dedupe",
"/api/delete-brand",
"/api/module-templates",
"/api/split");
"/api/split",
"/api/jd-collect");
private final RequestMappingHandlerMapping handlerMapping;
@@ -8,6 +8,7 @@ import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.retry.CredentialFatalClassifier;
import com.nanri.aiimage.common.task.TaskStatuses;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.modules.jd.mapper.JdProductMapper;
import com.nanri.aiimage.modules.jd.model.dto.JdCollectTaskCreateRequest;
import com.nanri.aiimage.modules.jd.model.dto.JdIngestChunkRequest;
@@ -18,6 +19,7 @@ import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity;
import com.nanri.aiimage.modules.task.service.CredentialFatalTaskCloser;
import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport;
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -308,7 +310,9 @@ public class JdResultIngestService {
try {
return objectMapper.convertValue(summary, JdIngestChunkRequest.JdProductSummaryDto.class);
} catch (IllegalArgumentException ex) {
throw new BusinessException("回传 summary 字段形状不合法: " + ex.getMessage(), ex);
// 原始异常文本不进用户可见出口(RawExceptionMessageSinkGuardTest):中文详情才拼接,原文只留日志。
log.warn("[jd-collect] 回传 summary 字段形状不合法 err={}", ex.getMessage(), ex);
throw new BusinessException(UserMessages.with("回传 summary 字段形状不合法", ex), ex);
}
}
@@ -331,7 +335,8 @@ public class JdResultIngestService {
private FileTaskEntity requireJdTask(Long taskId) {
FileTaskEntity task = fileTaskMapper.selectById(taskId);
if (task == null || !MODULE_TYPE.equals(task.getModuleType())) {
// 归属谓词走 TaskFinalizeSupport 出口(棘轮只许降不许升,新增校验不得手抄字面量)。
if (task == null || !TaskFinalizeSupport.belongsToModule(MODULE_TYPE, task.getModuleType())) {
throw new BusinessException("任务不存在");
}
return task;
@@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.jd.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.common.task.TaskStatuses;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
@@ -60,6 +61,7 @@ public class JdStaleTaskService {
DistributedJobLockService.LockHandle lock =
distributedJobLockService.tryLock("jd-collect:stale-check", java.time.Duration.ofMinutes(10));
if (lock == null) {
LockSkipWitness.abandoned("jd-collect:stale-check");
return;
}
try (lock) {
@@ -81,6 +83,7 @@ public class JdStaleTaskService {
TaskDistributedLockService.LockHandle taskLock =
taskDistributedLockService.acquire(MODULE_TYPE, task.getId(), 0L);
if (taskLock == null) {
LockSkipWitness.recordAbandoned("jd-collect:stale-finalize", MODULE_TYPE, task.getId());
continue;
}
try (taskLock) {