后端(四面9分批次): 锁跳过留痕、状态词表收成单点、版本硬地板进 yml 并记账

- 14 处「拿不到锁就 continue」过去零日志,现统一带可聚合锚点并有留痕判据
  (LockSkipWitnessTest 7 例 + LockSkipSilentExitGuardrailTest 4 例)。
- 任务状态词表:散落内联集合改由单一定义点判方向(TaskStatusVocabularyRatchetTest 7 例),
  CANCELED/CANCELLED 只做归一映射,没改库值也没改对外契约。
- 版本硬地板三键(min-supported / enforce / rejectUnreported)此前在任何 yml 里 0 处=出厂即惰性;
  现在入册且 enforce=false 走记账模式(ClientVersionFloorConfigTest 9 例),真挡谁留给用户拍。
- 业务码→HTTP 状态只做映射单点 + 开关(默认关,开启前逐字节等价,BusinessErrorHttpStatusTest 8 例);
  直接翻面会让三个前端把业务失败读成网络挂了。
- 验收:mvn -o test 这 5 个类 35 例 0 红(用 python subprocess 起 mvn——bash 里 cmd 包一层
  开的是交互式 cmd,rc 是 cmd 的,会给出假的 rc=0)。
This commit is contained in:
2026-10-09 23:09:37 +08:00
parent 54cfb70a43
commit 15094309cf
63 changed files with 2454 additions and 95 deletions
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.task.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
import io.swagger.v3.oas.annotations.Operation;
@@ -30,7 +31,7 @@ public class TaskFileJobController {
@RequestParam(value = "status", required = false) String status,
@RequestParam(value = "module_type", required = false) String moduleType,
@RequestParam(value = "task_id", required = false) Long taskId,
@RequestParam(value = "limit", defaultValue = "100") int limit) {
@RequestParam(value = "limit", defaultValue = PageDefaults.ADMIN_SCAN_LIMIT) int limit) {
// 上限钳制(2026-09):该运维端点此前对 limit 无校验
return ApiResponse.success(taskFileJobService.listJobs(status, moduleType, taskId,
Math.min(Math.max(1, limit), 1000)));
@@ -47,7 +48,7 @@ public class TaskFileJobController {
@Operation(summary = "手动扫描并复位卡住的 RUNNING Job")
public ApiResponse<Map<String, Object>> resetStuck(
@RequestParam(value = "timeout_minutes", defaultValue = "30") int timeoutMinutes,
@RequestParam(value = "limit", defaultValue = "100") int limit) {
@RequestParam(value = "limit", defaultValue = PageDefaults.ADMIN_SCAN_LIMIT) int limit) {
int reset = taskFileJobService.resetStuckRunningJobs(timeoutMinutes, limit);
return ApiResponse.success(Map.of("reset", reset));
}
@@ -40,7 +40,7 @@ public class CompletedTaskActiveJobInspector {
public ActiveJobReport inspectTerminalTasksWithActiveJobs(int limit) {
List<FileTaskEntity> tasks = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
.in(FileTaskEntity::getStatus, List.of("SUCCESS", "FAILED"))
.in(FileTaskEntity::getStatus, com.nanri.aiimage.common.task.TaskStatuses.FileTask.FINISHED_ORDERED)
.orderByAsc(FileTaskEntity::getUpdatedAt)
.last("limit " + Math.max(1, Math.min(limit, 500))));
if (tasks == null || tasks.isEmpty()) {
@@ -7,6 +7,7 @@ import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.CompanyScopeSupport;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.spi.ExpiredAccountTaskStopSpi;
@@ -62,6 +63,7 @@ public class ExpiredAccountTaskStopService {
public void stopTasksOfExpiredAccounts() {
var lock = distributedJobLockService.tryLock("expired-account-task-stop", Duration.ofSeconds(55));
if (lock == null) {
LockSkipWitness.abandoned("expired-account-task-stop");
return;
}
try (lock) {
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.task.service;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.config.InspectionProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.ObjectProvider;
@@ -59,6 +60,7 @@ public class InspectionSqlReportTask {
return;
}
if (distributedJobLockService == null) {
LockSkipWitness.abandoned("inspection:sql-report-lock-service-missing");
return;
}
DistributedJobLockService.LockHandle lockHandle =
@@ -40,7 +40,8 @@ import java.util.Set;
@Service
public class ModuleHistoryCleanupService {
private static final Set<String> TERMINAL_STATUSES = Set.of("SUCCESS", "FAILED", "CANCELLED", "CANCELED");
private static final Set<String> TERMINAL_STATUSES =
com.nanri.aiimage.common.task.TaskStatuses.FileTask.TERMINAL;
private static final Duration CLEANUP_LOCK_TTL = Duration.ofHours(2);
private static final String COLLECT_DATA_MODULE_TYPE = "COLLECT_DATA";
private static final int DEFAULT_BATCH_SIZE = 500;
@@ -152,7 +152,7 @@ public class TaskFileJobService {
public List<TaskFileJobEntity> listRunnableJobs(int limit) {
return taskFileJobMapper.selectList(new LambdaQueryWrapper<TaskFileJobEntity>()
.in(TaskFileJobEntity::getStatus, List.of("PENDING", "FAILED"))
.in(TaskFileJobEntity::getStatus, com.nanri.aiimage.common.task.TaskStatuses.Job.RETRYABLE_ORDERED)
.lt(TaskFileJobEntity::getRetryCount, MAX_RETRY_COUNT)
.orderByAsc(TaskFileJobEntity::getUpdatedAt)
.last("limit " + Math.max(1, Math.min(limit, 100))));
@@ -178,7 +178,7 @@ public class TaskFileJobService {
int safeLimit = Math.max(1, Math.min(limit, 100));
List<TaskFileJobEntity> ownerJobs = taskFileJobMapper.selectList(new LambdaQueryWrapper<TaskFileJobEntity>()
.in(TaskFileJobEntity::getStatus, List.of("PENDING", "FAILED"))
.in(TaskFileJobEntity::getStatus, com.nanri.aiimage.common.task.TaskStatuses.Job.RETRYABLE_ORDERED)
.lt(TaskFileJobEntity::getRetryCount, MAX_RETRY_COUNT)
.in(TaskFileJobEntity::getModuleType, List.of("APPEARANCE_PATENT", "SIMILAR_ASIN", "PUBLISH", "SHOP_DATA_CRAWL"))
.eq(TaskFileJobEntity::getOwner, normalizedOwner)
@@ -188,7 +188,7 @@ public class TaskFileJobService {
List<TaskFileJobEntity> candidates = new ArrayList<>(ownerJobs);
if (ownerJobs.size() < safeLimit) {
LambdaQueryWrapper<TaskFileJobEntity> genericWrapper = new LambdaQueryWrapper<TaskFileJobEntity>()
.in(TaskFileJobEntity::getStatus, List.of("PENDING", "FAILED"))
.in(TaskFileJobEntity::getStatus, com.nanri.aiimage.common.task.TaskStatuses.Job.RETRYABLE_ORDERED)
.lt(TaskFileJobEntity::getRetryCount, MAX_RETRY_COUNT)
.and(wrapper -> wrapper
.notIn(TaskFileJobEntity::getModuleType, List.of("APPEARANCE_PATENT", "SIMILAR_ASIN", "PUBLISH", "SHOP_DATA_CRAWL"))
@@ -236,7 +236,7 @@ public class TaskFileJobService {
int safeLimit = Math.max(1, Math.min(limit, 100));
List<TaskFileJobEntity> ownerJobs = taskFileJobMapper.selectList(new LambdaQueryWrapper<TaskFileJobEntity>()
.in(TaskFileJobEntity::getStatus, List.of("PENDING", "FAILED"))
.in(TaskFileJobEntity::getStatus, com.nanri.aiimage.common.task.TaskStatuses.Job.RETRYABLE_ORDERED)
.lt(TaskFileJobEntity::getRetryCount, MAX_RETRY_COUNT)
.in(TaskFileJobEntity::getModuleType, List.of("APPEARANCE_PATENT", "SIMILAR_ASIN", "PUBLISH", "SHOP_DATA_CRAWL"))
.eq(TaskFileJobEntity::getOwner, normalizedOwner)
@@ -248,7 +248,7 @@ public class TaskFileJobService {
List<TaskFileJobEntity> jobs = new ArrayList<>(ownerJobs);
LambdaQueryWrapper<TaskFileJobEntity> genericWrapper = new LambdaQueryWrapper<TaskFileJobEntity>()
.in(TaskFileJobEntity::getStatus, List.of("PENDING", "FAILED"))
.in(TaskFileJobEntity::getStatus, com.nanri.aiimage.common.task.TaskStatuses.Job.RETRYABLE_ORDERED)
.lt(TaskFileJobEntity::getRetryCount, MAX_RETRY_COUNT)
.and(wrapper -> wrapper
.notIn(TaskFileJobEntity::getModuleType, List.of("APPEARANCE_PATENT", "SIMILAR_ASIN", "PUBLISH", "SHOP_DATA_CRAWL"))
@@ -521,7 +521,7 @@ public class TaskFileJobService {
}
return taskFileJobMapper.update(null, new LambdaUpdateWrapper<TaskFileJobEntity>()
.eq(TaskFileJobEntity::getId, jobId)
.in(TaskFileJobEntity::getStatus, List.of("PENDING", "FAILED"))
.in(TaskFileJobEntity::getStatus, com.nanri.aiimage.common.task.TaskStatuses.Job.RETRYABLE_ORDERED)
.and(wrapper -> wrapper.isNull(TaskFileJobEntity::getRetryCount)
.or()
.lt(TaskFileJobEntity::getRetryCount, MAX_RETRY_COUNT))
@@ -831,7 +831,7 @@ public class TaskFileJobService {
.eq(TaskFileJobEntity::getTaskId, taskId)
.eq(TaskFileJobEntity::getModuleType, moduleType)
.eq(TaskFileJobEntity::getJobType, JOB_TYPE_ASSEMBLE_RESULT)
.in(TaskFileJobEntity::getStatus, List.of("PENDING", "RUNNING")));
.in(TaskFileJobEntity::getStatus, com.nanri.aiimage.common.task.TaskStatuses.Job.ACTIVE_ORDERED));
return count == null ? 0L : count;
}
@@ -21,7 +21,8 @@ import java.util.concurrent.ConcurrentHashMap;
@RequiredArgsConstructor
public class TaskProgressSnapshotService {
private static final Set<String> TERMINAL_STATUSES = Set.of("SUCCESS", "FAILED", "CANCELLED", "CANCELED");
private static final Set<String> TERMINAL_STATUSES =
com.nanri.aiimage.common.task.TaskStatuses.FileTask.TERMINAL;
private final TaskProgressSnapshotMapper taskProgressSnapshotMapper;
private final ObjectMapper objectMapper;
@@ -41,7 +41,7 @@ public class TaskResultMissingInspector {
public MissingResultReport inspectTasksMissingResult(int limit) {
List<FileTaskEntity> tasks = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
.in(FileTaskEntity::getStatus, List.of("SUCCESS", "FAILED"))
.in(FileTaskEntity::getStatus, com.nanri.aiimage.common.task.TaskStatuses.FileTask.FINISHED_ORDERED)
.orderByAsc(FileTaskEntity::getUpdatedAt)
.last("limit " + Math.max(1, Math.min(limit, 500))));
if (tasks == null || tasks.isEmpty()) {