后端(四面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.imagevideo.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.DataReadScope;
@@ -78,8 +79,8 @@ public class AdminImageVideoTaskController {
@GetMapping
@Operation(summary = "分页查询图生视频任务", description = "管理端按用户/任务状态/提交时间等条件分页查询近 3 天的工作流任务")
public ApiResponse<Map<String, Object>> page(
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(name = "page_size", defaultValue = "20") Integer pageSize,
@RequestParam(defaultValue = PageDefaults.FIRST_PAGE) Integer page,
@RequestParam(name = "page_size", defaultValue = PageDefaults.ADMIN_LIST_PAGE_SIZE) Integer pageSize,
@RequestParam(name = "user_id", required = false) Long userId,
@RequestParam(required = false) String username,
@RequestParam(required = false) String status,
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.config.ImageVideoProperties;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
@@ -115,6 +116,7 @@ public class ImageVideoArchiveService {
DistributedJobLockService.LockHandle jobLock = distributedJobLockService.tryLock(
"image-video:retention-cleanup", java.time.Duration.ofMinutes(20));
if (jobLock == null) {
LockSkipWitness.abandoned("image-video:retention-cleanup");
return;
}
try (jobLock) {
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.config.InstanceMetadata;
@@ -141,6 +142,7 @@ public class ImageVideoAsyncTaskService {
DistributedJobLockService.LockHandle jobLock =
distributedJobLockService.tryLock("image-video:dispatch", java.time.Duration.ofSeconds(5));
if (jobLock == null) {
LockSkipWitness.abandoned("image-video:dispatch");
return;
}
try (jobLock) {
@@ -163,6 +165,7 @@ public class ImageVideoAsyncTaskService {
DistributedJobLockService.LockHandle jobLock =
distributedJobLockService.tryLock("image-video:poll", java.time.Duration.ofSeconds(30));
if (jobLock == null) {
LockSkipWitness.abandoned("image-video:poll");
return;
}
try (jobLock) {
@@ -208,6 +211,7 @@ public class ImageVideoAsyncTaskService {
DistributedJobLockService.LockHandle jobLock =
distributedJobLockService.tryLock("image-video:owner-takeover", java.time.Duration.ofSeconds(30));
if (jobLock == null) {
LockSkipWitness.abandoned("image-video:owner-takeover");
return;
}
try (jobLock) {
@@ -244,6 +248,7 @@ public class ImageVideoAsyncTaskService {
DistributedJobLockService.LockHandle jobLock =
distributedJobLockService.tryLock("image-video:failed-task-cleanup", java.time.Duration.ofSeconds(120));
if (jobLock == null) {
LockSkipWitness.abandoned("image-video:failed-task-cleanup");
return;
}
try (jobLock) {