后端(四面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.admin.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.modules.admin.model.dto.AdminUserCreateRequest;
import com.nanri.aiimage.modules.admin.model.dto.AdminUserUpdateRequest;
import com.nanri.aiimage.modules.admin.model.vo.AdminUserListVo;
@@ -33,8 +34,8 @@ public class AdminUserController {
@GetMapping("/users")
@Operation(summary = "分页查询用户列表")
public ApiResponse<AdminUserListVo> listUsers(HttpServletRequest request,
@RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(name = "page_size", required = false, defaultValue = "15") Integer pageSize,
@RequestParam(required = false, defaultValue = PageDefaults.FIRST_PAGE) Integer page,
@RequestParam(name = "page_size", required = false, defaultValue = PageDefaults.USER_LIST_PAGE_SIZE) Integer pageSize,
@RequestParam(required = false) String username,
@RequestParam(name = "search", required = false) String search,
@RequestParam(name = "created_by_id", required = false) Long createdById,
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.appearancepatent.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentParseRequest;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentSubmitResultRequest;
@@ -72,7 +73,7 @@ public class AppearancePatentController {
@Parameter(description = "当前用户 ID,用于查询该用户自己的历史记录。", required = true, example = "1")
@RequestParam("user_id") Long userId,
@Parameter(description = "历史记录条数,默认 50,最大 100", example = "50")
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
@RequestParam(value = "limit", required = false, defaultValue = PageDefaults.DEFAULT_RESULT_LIMIT) Integer limit,
HttpServletRequest httpRequest) {
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
// 上限钳制(2026-09):文档写"最大 100"但此前无实际校验
@@ -12,6 +12,7 @@ import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePate
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.GroupResultPropagator;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.util.FailedStatusRowFilter;
import com.nanri.aiimage.common.util.StaleTaskDeathReason;
import com.nanri.aiimage.config.AppearancePatentProperties;
@@ -651,6 +652,7 @@ public class AppearancePatentTaskService {
TaskDistributedLockService.LockHandle lockHandle = acquireTaskLock(task.getId(), 0L);
if (lockHandle == null) {
// 锁被 owner 实例/文件任务 worker 占用说明其仍活跃,静默跳过等下一轮
LockSkipWitness.recordSkip("appearance-patent:running-stale-scan", MODULE_TYPE, task.getId());
continue;
}
try (lockHandle) {
@@ -666,6 +668,7 @@ public class AppearancePatentTaskService {
}
TaskDistributedLockService.LockHandle lockHandle = acquireTaskLock(taskId, 0L);
if (lockHandle == null) {
LockSkipWitness.recordAbandoned("appearance-patent:debug-finalize-stale", MODULE_TYPE, taskId);
return;
}
try (lockHandle) {
@@ -794,6 +797,8 @@ public class AppearancePatentTaskService {
}
TaskDistributedLockService.LockHandle neverReportedLock = acquireTaskLock(task.getId(), 0L);
if (neverReportedLock == null) {
LockSkipWitness.recordSkip("appearance-patent:never-reported-stale-scan",
MODULE_TYPE, task.getId());
continue;
}
try (neverReportedLock) {
@@ -817,6 +822,7 @@ public class AppearancePatentTaskService {
}
TaskDistributedLockService.LockHandle lockHandle = acquireTaskLock(task.getId(), 0L);
if (lockHandle == null) {
LockSkipWitness.recordSkip("appearance-patent:no-result-shard-stale-scan", MODULE_TYPE, task.getId());
continue;
}
try (lockHandle) {
@@ -19,9 +19,13 @@ import java.util.List;
@RequiredArgsConstructor
public class BrandTaskExpiredStopSpiImpl implements ExpiredAccountTaskStopSpi {
private static final String STATUS_PENDING = "pending";
private static final String STATUS_RUNNING = "running";
private static final String STATUS_CANCELLED = "cancelled";
// 词表唯一出处:TaskStatuses.BrandTask(brand_crawl_tasks 状态是小写)。
private static final String STATUS_PENDING =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.PENDING;
private static final String STATUS_RUNNING =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.RUNNING;
private static final String STATUS_CANCELLED =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.CANCELLED;
private final BrandCrawlTaskMapper brandCrawlTaskMapper;
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.brand.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.util.LockSkipWitness;
import cn.hutool.core.io.FileUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -101,11 +102,18 @@ public class BrandTaskService {
return BLOCKED_SOURCE_HOSTS.contains(normalized) || normalized.endsWith(".localhost");
}
private static final long RESULT_SUBMIT_WAIT_MILLIS = 5 * 60 * 1000L;
private static final String STATUS_PENDING = "pending";
private static final String STATUS_RUNNING = "running";
private static final String STATUS_SUCCESS = "success";
private static final String STATUS_FAILED = "failed";
private static final String STATUS_CANCELLED = "cancelled";
// 状态词表唯一出处见 com.nanri.aiimage.common.task.TaskStatuses.BrandTask(brand_crawl_tasks 是小写表)。
// 这里只留别名,不再抄字面量:这张表的值一旦和任务中心 UNION 的口径漂了,brand 任务会整批静默消失。
private static final String STATUS_PENDING =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.PENDING;
private static final String STATUS_RUNNING =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.RUNNING;
private static final String STATUS_SUCCESS =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.SUCCESS;
private static final String STATUS_FAILED =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.FAILED;
private static final String STATUS_CANCELLED =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.CANCELLED;
private static final String MODULE_TYPE = "BRAND";
/** 结果文件并发上传数:OSS/MinIO 上传互不依赖,3 并发平衡收益与内存占用。 */
private static final int RESULT_UPLOAD_CONCURRENCY = 3;
@@ -1537,6 +1545,7 @@ public class BrandTaskService {
for (BrandCrawlTaskEntity task : runningTasks) {
TaskDistributedLockService.LockHandle taskLockHandle = acquireTaskLock(task.getId(), 0L);
if (taskLockHandle == null) {
LockSkipWitness.recordSkip("brand:stale-running-scan", MODULE_TYPE, task.getId());
continue;
}
try (taskLockHandle) {
@@ -1597,6 +1606,7 @@ public class BrandTaskService {
for (BrandCrawlTaskEntity task : runningTasks) {
TaskDistributedLockService.LockHandle taskLockHandle = acquireTaskLock(task.getId(), 0L);
if (taskLockHandle == null) {
LockSkipWitness.recordSkip("brand:long-running-scan", MODULE_TYPE, task.getId());
continue;
}
try (taskLockHandle) {
@@ -18,9 +18,13 @@ import java.util.List;
@RequiredArgsConstructor
public class BrandTaskStaleRepairSpiImpl implements BrandTaskStaleRepairSpi {
private static final String STATUS_PENDING = "pending";
private static final String STATUS_RUNNING = "running";
private static final String STATUS_FAILED = "failed";
// 词表唯一出处:TaskStatuses.BrandTask(brand_crawl_tasks 状态是小写)。
private static final String STATUS_PENDING =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.PENDING;
private static final String STATUS_RUNNING =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.RUNNING;
private static final String STATUS_FAILED =
com.nanri.aiimage.common.task.TaskStatuses.BrandTask.FAILED;
private final BrandCrawlTaskMapper brandCrawlTaskMapper;
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.collectdata.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.collectdata.model.dto.CollectDataCountryPreferenceSaveRequest;
import com.nanri.aiimage.modules.collectdata.model.dto.CollectDataParseRequest;
@@ -88,9 +89,9 @@ public class CollectDataController {
@Parameter(description = "用户 ID,可选;传入时会校验任务归属")
@RequestParam(value = "user_id", required = false) Long userId,
@Parameter(description = "页码,从 1 开始", example = "1")
@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
@RequestParam(value = "page", required = false, defaultValue = PageDefaults.FIRST_PAGE) Integer page,
@Parameter(description = "每页条数,默认 50,最大 200", example = "50")
@RequestParam(value = "page_size", required = false, defaultValue = "50") Integer pageSize,
@RequestParam(value = "page_size", required = false, defaultValue = PageDefaults.TASK_LIST_PAGE_SIZE) Integer pageSize,
HttpServletRequest httpRequest) {
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
return ApiResponse.success(service.getItemsPage(taskId, userId, page, pageSize));
@@ -121,7 +122,7 @@ public class CollectDataController {
@Parameter(description = "当前用户 ID", required = true, example = "1")
@RequestParam("user_id") Long userId,
@Parameter(description = "返回数量上限,默认 50,最大 100", example = "50")
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
@RequestParam(value = "limit", required = false, defaultValue = PageDefaults.DEFAULT_RESULT_LIMIT) Integer limit,
HttpServletRequest httpRequest) {
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
return ApiResponse.success(service.history(userId, limit));
@@ -12,6 +12,7 @@ import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.modules.asincache.service.AsinResultCacheService;
import com.nanri.aiimage.modules.collectdata.mapper.CollectDataCountryPrefMapper;
import com.nanri.aiimage.modules.collectdata.mapper.CollectDataItemMapper;
@@ -568,6 +569,7 @@ public class CollectDataService {
try (TaskDistributedLockService.LockHandle lock =
taskDistributedLockService.acquire(MODULE_TYPE, taskId, 0L)) {
if (lock == null) {
LockSkipWitness.recordAbandoned("collect-data:stale-finalize", MODULE_TYPE, taskId);
return;
}
FileTaskEntity task = fileTaskMapper.selectById(taskId);
@@ -674,6 +676,7 @@ public class CollectDataService {
try (TaskDistributedLockService.LockHandle lock =
taskDistributedLockService.acquire(MODULE_TYPE, taskId, 0L)) {
if (lock == null) {
LockSkipWitness.recordAbandoned("collect-data:no-upload-stale-finalize", MODULE_TYPE, taskId);
return;
}
FileTaskEntity task = fileTaskMapper.selectById(taskId);
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.dedupe.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.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
@@ -78,8 +79,8 @@ public class DedupeTotalDataController {
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "查询成功", content = @Content(schema = @Schema(implementation = DedupeTotalDataPageVo.class)))
})
public ApiResponse<DedupeTotalDataPageVo> page(
@Parameter(description = "页码") @RequestParam(name = "page", defaultValue = "1") Long page,
@Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = "15") Long pageSize,
@Parameter(description = "页码") @RequestParam(name = "page", defaultValue = PageDefaults.FIRST_PAGE) Long page,
@Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = PageDefaults.USER_LIST_PAGE_SIZE) Long pageSize,
@Parameter(description = "数据值模糊搜索关键字") @RequestParam(name = "keyword", required = false) String keyword,
@Parameter(description = "用户名模糊搜索关键字") @RequestParam(name = "username", required = false) String username,
@Parameter(description = "开始日期(包含)")
@@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.deletebrand.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.util.LockSkipWitness;
import com.nanri.aiimage.config.DeleteBrandProgressProperties;
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService;
import com.nanri.aiimage.modules.brand.service.BrandTaskService;
@@ -236,6 +237,8 @@ public class DeleteBrandStaleTaskService {
TaskDistributedLockService.LockHandle taskLockHandle = acquireTaskLock(MODULE_TYPE_DELETE_BRAND, task.getId());
if (taskLockHandle == null) {
LockSkipWitness.recordSkip("delete-brand:stale-heartbeat-scan",
MODULE_TYPE_DELETE_BRAND, task.getId());
continue;
}
boolean finalizeThrew;
@@ -947,6 +950,8 @@ public class DeleteBrandStaleTaskService {
for (FileTaskEntity task : runningTasks) {
TaskDistributedLockService.LockHandle taskLockHandle = acquireTaskLock(MODULE_TYPE_DELETE_BRAND, task.getId());
if (taskLockHandle == null) {
LockSkipWitness.recordSkip("delete-brand:partial-result-scan",
MODULE_TYPE_DELETE_BRAND, task.getId());
continue;
}
try (taskLockHandle) {
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.devicelog.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.security.AdminAuthSupport;
@@ -66,8 +67,8 @@ public class AdminDeviceLogController {
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
@Parameter(description = "结束日期(含)") @RequestParam(required = false)
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate,
@RequestParam(defaultValue = "1") Long page,
@RequestParam(defaultValue = "20") Long pageSize,
@RequestParam(defaultValue = PageDefaults.FIRST_PAGE) Long page,
@RequestParam(defaultValue = PageDefaults.ADMIN_LIST_PAGE_SIZE) Long pageSize,
@Parameter(description = "公司 ID(超管 tab;不传=不筛)")
@RequestParam(name = "company_id", required = false) Long companyId) {
AdminUserEntity operator = requireSuperAdmin(request);
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.imagehistory.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.security.AdminAuthSupport;
import com.nanri.aiimage.common.service.DataReadScope;
@@ -34,8 +35,8 @@ public class ImageHistoryController {
@GetMapping("/history")
@Operation(summary = "分页查询所有用户生成历史")
public ApiResponse<ImageHistoryListVo> listHistory(HttpServletRequest request,
@RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(name = "page_size", required = false, defaultValue = "15") Integer pageSize,
@RequestParam(required = false, defaultValue = PageDefaults.FIRST_PAGE) Integer page,
@RequestParam(name = "page_size", required = false, defaultValue = PageDefaults.USER_LIST_PAGE_SIZE) Integer pageSize,
@RequestParam(name = "user_id", required = false) Long userId,
@RequestParam(name = "time_start", required = false) String timeStart,
@RequestParam(name = "time_end", required = false) String timeEnd,
@@ -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) {
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.invalidasin.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.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
@@ -57,8 +58,8 @@ public class InvalidAsinDataController {
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "查询成功", content = @Content(schema = @Schema(implementation = InvalidAsinDataPageVo.class)))
})
public ApiResponse<InvalidAsinDataPageVo> page(
@Parameter(description = "页码") @RequestParam(name = "page", defaultValue = "1") Long page,
@Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = "15") Long pageSize,
@Parameter(description = "页码") @RequestParam(name = "page", defaultValue = PageDefaults.FIRST_PAGE) Long page,
@Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = PageDefaults.USER_LIST_PAGE_SIZE) Long pageSize,
@Parameter(description = "模糊搜索关键字") @RequestParam(name = "keyword", required = false) String keyword,
@Parameter(description = "ASIN 模糊搜索") @RequestParam(name = "data_value", required = false) String dataValue,
@Parameter(description = "品牌模糊搜索") @RequestParam(name = "brand", required = false) String brand,
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.notification.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.notification.model.dto.NotificationPageQuery;
import com.nanri.aiimage.modules.notification.model.vo.NotificationPageVo;
@@ -49,8 +50,8 @@ public class AdminNotificationController {
+ "startDate/endDate 为年月日闭区间。")
public ApiResponse<NotificationPageVo> page(
HttpServletRequest request,
@Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = "20") Long pageSize,
@Parameter(description = "页码") @RequestParam(defaultValue = PageDefaults.FIRST_PAGE) Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = PageDefaults.ADMIN_LIST_PAGE_SIZE) Long pageSize,
@Parameter(description = "只看未读") @RequestParam(required = false, defaultValue = "false") Boolean onlyUnread,
@Parameter(description = "关键字(标题/内容)") @RequestParam(required = false) String keyword,
@Parameter(description = "类型大类:system_error/task_error/config_error/system_notice")
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.notification.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.notification.model.dto.NotificationPageQuery;
import com.nanri.aiimage.modules.notification.model.vo.NotificationPageVo;
@@ -49,8 +50,8 @@ public class NotificationController {
+ "startDate/endDate 为年月日闭区间。")
public ApiResponse<NotificationPageVo> page(
HttpServletRequest request,
@Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = "20") Long pageSize,
@Parameter(description = "页码") @RequestParam(defaultValue = PageDefaults.FIRST_PAGE) Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = PageDefaults.ADMIN_LIST_PAGE_SIZE) Long pageSize,
@Parameter(description = "只看未读") @RequestParam(required = false, defaultValue = "false") Boolean onlyUnread,
@Parameter(description = "关键字(标题/内容)") @RequestParam(required = false) String keyword,
@Parameter(description = "类型大类:system_error/task_error/config_error/system_notice")
@@ -105,7 +105,8 @@ public class PatrolDeleteTaskService {
validateUserId(userId);
ProductRiskDashboardVo vo = new ProductRiskDashboardVo();
vo.setCandidateCount(patrolDeleteResolveService.countCandidates(userId));
vo.setProcessedTaskCount(countTasks(userId, List.of("SUCCESS", "FAILED")));
vo.setProcessedTaskCount(countTasks(userId,
com.nanri.aiimage.common.task.TaskStatuses.FileTask.FINISHED_ORDERED));
vo.setSuccessTaskCount(countTasks(userId, List.of("SUCCESS")));
vo.setFailedTaskCount(countTasks(userId, List.of("FAILED")));
return vo;
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.pricetrack.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.pricetrack.model.dto.PriceTrackCandidateAddRequest;
import com.nanri.aiimage.modules.pricetrack.model.dto.PriceTrackCountryPreferenceSaveRequest;
@@ -142,9 +143,9 @@ public class PriceTrackController {
@Parameter(description = "任务编号", required = true, example = "200")
@PathVariable Long taskId,
@Parameter(description = "页码,从 1 开始", example = "1")
@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "page", defaultValue = PageDefaults.FIRST_PAGE) Integer page,
@Parameter(description = "每页条数,默认 1000,最大 2000", example = "1000")
@RequestParam(value = "page_size", defaultValue = "1000") Integer pageSize,
@RequestParam(value = "page_size", defaultValue = PageDefaults.FULL_EXPORT_PAGE_SIZE) Integer pageSize,
@Parameter(description = "店铺名称过滤条件,可重复传入,也可用英文逗号分隔;仅在任务关联店铺范围内生效", example = "测试店铺A")
@RequestParam(value = "shop_name", required = false) List<String> shopNames,
@Parameter(description = "国家代码过滤条件,可重复传入,也可用英文逗号分隔;仅在任务国家范围内生效", example = "DE")
@@ -65,7 +65,8 @@ public class PriceTrackLoopRunStaleService {
private static final String STATUS_STOPPED = "STOPPED";
/** 子任务终态集合,与 PriceTrackLoopRunService.isChildTaskTerminal 口径一致。 */
private static final Set<String> CHILD_TERMINAL_STATUSES = Set.of("SUCCESS", "FAILED", "STOPPED");
private static final Set<String> CHILD_TERMINAL_STATUSES =
com.nanri.aiimage.common.task.TaskStatuses.LoopRun.TERMINAL;
/** 单轮最多扫描的轮次数,其余留给下一轮(每 2 分钟一次),避免一次扫太多拖慢巡检。 */
static final int MAX_LOOP_RUNS_PER_SCAN = 200;
@@ -142,7 +142,8 @@ public class PriceTrackTaskService {
Long processed = fileTaskMapper.selectCount(new LambdaQueryWrapper<FileTaskEntity>()
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
.eq(FileTaskEntity::getUserId, userId)
.in(FileTaskEntity::getStatus, List.of("SUCCESS", "FAILED")));
.in(FileTaskEntity::getStatus,
com.nanri.aiimage.common.task.TaskStatuses.FileTask.FINISHED_ORDERED));
Long success = fileTaskMapper.selectCount(new LambdaQueryWrapper<FileTaskEntity>()
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
.eq(FileTaskEntity::getUserId, userId)
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.productcategory.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
@@ -61,8 +62,8 @@ public class ProductCategoryController {
public ApiResponse<ProductCategoryListVo> children(
HttpServletRequest request,
@RequestParam(value = "parent_id", required = false) Long parentId,
@RequestParam(value = "page", defaultValue = "1") Long page,
@RequestParam(value = "page_size", defaultValue = "20") Long pageSize) {
@RequestParam(value = "page", defaultValue = PageDefaults.FIRST_PAGE) Long page,
@RequestParam(value = "page_size", defaultValue = PageDefaults.ADMIN_LIST_PAGE_SIZE) Long pageSize) {
requireOperator(request);
return ApiResponse.success(productCategoryService.children(parentId, page, pageSize));
}
@@ -72,8 +73,8 @@ public class ProductCategoryController {
public ApiResponse<ProductCategoryListVo> search(
HttpServletRequest request,
@RequestParam(value = "keyword", required = false) String keyword,
@RequestParam(value = "page", defaultValue = "1") Long page,
@RequestParam(value = "page_size", defaultValue = "20") Long pageSize) {
@RequestParam(value = "page", defaultValue = PageDefaults.FIRST_PAGE) Long page,
@RequestParam(value = "page_size", defaultValue = PageDefaults.ADMIN_LIST_PAGE_SIZE) Long pageSize) {
requireOperator(request);
return ApiResponse.success(productCategoryService.search(keyword, page, pageSize));
}
@@ -128,7 +128,8 @@ public class ProductRiskTaskService {
Long processed = fileTaskMapper.selectCount(new LambdaQueryWrapper<FileTaskEntity>()
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
.eq(FileTaskEntity::getUserId, userId)
.in(FileTaskEntity::getStatus, List.of("SUCCESS", "FAILED")));
.in(FileTaskEntity::getStatus,
com.nanri.aiimage.common.task.TaskStatuses.FileTask.FINISHED_ORDERED));
Long success = fileTaskMapper.selectCount(new LambdaQueryWrapper<FileTaskEntity>()
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
.eq(FileTaskEntity::getUserId, userId)
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.publish.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.publish.model.dto.PublishParseRequest;
import com.nanri.aiimage.modules.publish.model.dto.PublishSubmitResultRequest;
@@ -94,9 +95,9 @@ public class PublishController {
@Parameter(description = "任务内文件 ID", required = true, example = "9101")
@RequestParam("file_id") Long fileId,
@Parameter(description = "页码,从 1 开始", example = "1")
@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "page", defaultValue = PageDefaults.FIRST_PAGE) Integer page,
@Parameter(description = "每页条数,默认 50,最大 200", example = "50")
@RequestParam(value = "page_size", defaultValue = "50") Integer pageSize,
@RequestParam(value = "page_size", defaultValue = PageDefaults.TASK_LIST_PAGE_SIZE) Integer pageSize,
HttpServletRequest httpRequest) {
return ApiResponse.success(publishTaskService.getItemsPage(taskId,
adminAuthSupport.resolveOwnershipUserId(httpRequest, userId), fileId, page, pageSize));
@@ -164,7 +165,7 @@ public class PublishController {
@Parameter(description = "当前登录用户 ID;服务端按会话身份校验,与登录账号不一致即拒绝", required = true, example = "1")
@RequestParam("user_id") Long userId,
@Parameter(description = "返回数量上限,默认 50,最大 100", example = "50")
@RequestParam(value = "limit", defaultValue = "50") Integer limit,
@RequestParam(value = "limit", defaultValue = PageDefaults.DEFAULT_RESULT_LIMIT) Integer limit,
HttpServletRequest httpRequest) {
// 上限钳制(2026-09):文档写"最多返回 100 条"但此前无实际校验
int safeLimit = limit == null ? 100 : Math.min(Math.max(1, limit), 100);
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.config.InstanceMetadata;
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
@@ -103,7 +104,7 @@ public class PublishTaskService {
* PENDING/RUNNING 绝不在此列;PUBLISH 实际只会写 SUCCESS/FAILED,取消态是无害的超集。
*/
private static final Set<String> RETENTION_TERMINAL_STATUSES =
Set.of(STATUS_SUCCESS, STATUS_FAILED, "CANCELLED", "CANCELED");
com.nanri.aiimage.common.task.TaskStatuses.FileTask.TERMINAL;
private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
private final LocalFileStorageService localFileStorageService;
@@ -520,6 +521,7 @@ public class PublishTaskService {
try (TaskDistributedLockService.LockHandle lock =
taskDistributedLockService.acquire(MODULE_TYPE, candidate.getId(), 0L)) {
if (lock == null) {
LockSkipWitness.recordSkip("publish:stale-heartbeat-scan", MODULE_TYPE, candidate.getId());
continue;
}
transactionTemplate.executeWithoutResult(status -> failStaleTaskLocked(candidate.getId(), threshold));
@@ -967,6 +969,7 @@ public class PublishTaskService {
try (TaskDistributedLockService.LockHandle lock =
taskDistributedLockService.acquire(MODULE_TYPE, candidate.getId(), 0L)) {
if (lock == null) {
LockSkipWitness.recordAbandoned("publish:no-upload-stale-finalize", MODULE_TYPE, candidate.getId());
return;
}
transactionTemplate.executeWithoutResult(status -> failStaleTaskLockedInternal(
@@ -116,7 +116,8 @@ public class QueryAsinTaskService {
validateUserId(userId);
ProductRiskDashboardVo vo = new ProductRiskDashboardVo();
vo.setCandidateCount(queryAsinResolveService.countCandidates(userId));
vo.setProcessedTaskCount(countTasks(userId, List.of("SUCCESS", "FAILED")));
vo.setProcessedTaskCount(countTasks(userId,
com.nanri.aiimage.common.task.TaskStatuses.FileTask.FINISHED_ORDERED));
vo.setSuccessTaskCount(countTasks(userId, List.of("SUCCESS")));
vo.setFailedTaskCount(countTasks(userId, List.of("FAILED")));
return vo;
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.shopdatacrawl.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCandidateAddRequest;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCountryPreferenceSaveRequest;
@@ -158,9 +159,9 @@ public class ShopDataCrawlTaskController {
in = ParameterIn.QUERY, example = "1")
@RequestParam("user_id") Long userId,
@Parameter(name = "page", description = "页号,从 1 开始", in = ParameterIn.QUERY, example = "1")
@RequestParam(value = "page", defaultValue = "1") int page,
@RequestParam(value = "page", defaultValue = PageDefaults.FIRST_PAGE) int page,
@Parameter(name = "limit", description = "每页条数,最大 100;默认 100 与旧版返回最近 100 条的行为一致", in = ParameterIn.QUERY, example = "20")
@RequestParam(value = "limit", defaultValue = "100") int limit,
@RequestParam(value = "limit", defaultValue = PageDefaults.ADMIN_SCAN_LIMIT) int limit,
HttpServletRequest httpRequest) {
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
return ApiResponse.success(taskService.listHistory(userId, page, limit));
@@ -345,7 +345,8 @@ public class ShopDataCrawlTaskService {
validateUserId(userId);
ProductRiskDashboardVo vo = new ProductRiskDashboardVo();
vo.setCandidateCount(shopDataCrawlResolveService.countCandidates(userId));
vo.setProcessedTaskCount(countTasks(userId, List.of("SUCCESS", "FAILED")));
vo.setProcessedTaskCount(countTasks(userId,
com.nanri.aiimage.common.task.TaskStatuses.FileTask.FINISHED_ORDERED));
vo.setSuccessTaskCount(countTasks(userId, List.of("SUCCESS")));
vo.setFailedTaskCount(countTasks(userId, List.of("FAILED")));
return vo;
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
@@ -60,8 +61,8 @@ public class QueryAsinController {
@Operation(summary = "分页查询 ASIN", description = "company_id 只收窄可见集、不放大,跨公司查看仅超管")
public ApiResponse<QueryAsinPageVo> page(
HttpServletRequest request,
@Parameter(description = "页码") @RequestParam(name = "page", defaultValue = "1") Long page,
@Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = "15") Long pageSize,
@Parameter(description = "页码") @RequestParam(name = "page", defaultValue = PageDefaults.FIRST_PAGE) Long page,
@Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = PageDefaults.USER_LIST_PAGE_SIZE) Long pageSize,
@Parameter(description = "分组ID") @RequestParam(name = "group_id", required = false) Long groupId,
@Parameter(description = "店铺名") @RequestParam(name = "shop_name", required = false) String shopName,
@Parameter(description = "商品 ASIN") @RequestParam(name = "asin", required = false) String asin,
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.service.DataReadScope;
@@ -58,8 +59,8 @@ public class ShopKeyController {
})
public ApiResponse<ShopKeyPageVo> page(
HttpServletRequest request,
@Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize,
@Parameter(description = "页码") @RequestParam(defaultValue = PageDefaults.FIRST_PAGE) Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = PageDefaults.USER_LIST_PAGE_SIZE) Long pageSize,
@Parameter(description = "按公司筛选(仅超管生效;非超管一律按会话公司裁剪)")
@RequestParam(name = "company_id", required = false) Long companyId,
@Parameter(description = "备注名 / 紫鸟账号 模糊词")
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
@@ -79,8 +80,8 @@ public class ShopManageController {
})
public ApiResponse<ShopManagePageVo> page(
HttpServletRequest request,
@Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize,
@Parameter(description = "页码") @RequestParam(defaultValue = PageDefaults.FIRST_PAGE) Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = PageDefaults.USER_LIST_PAGE_SIZE) Long pageSize,
@Parameter(description = "分组 ID") @RequestParam(required = false) Long groupId,
@Parameter(description = "店铺名称") @RequestParam(required = false) String shopName,
@Parameter(description = "公司 ID") @RequestParam(name = "company_id", required = false) Long companyId) {
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
@@ -60,8 +61,8 @@ public class SkipPriceAsinController {
@Operation(summary = "分页查询跳过跟价 ASIN", description = "支持按分组、店铺名、ASIN 和当前操作人可见范围筛选。")
public ApiResponse<SkipPriceAsinPageVo> page(
HttpServletRequest request,
@Parameter(description = "页码") @RequestParam(name = "page", defaultValue = "1") Long page,
@Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = "15") Long pageSize,
@Parameter(description = "页码") @RequestParam(name = "page", defaultValue = PageDefaults.FIRST_PAGE) Long page,
@Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = PageDefaults.USER_LIST_PAGE_SIZE) Long pageSize,
@Parameter(description = "分组 ID") @RequestParam(name = "group_id", required = false) Long groupId,
@Parameter(description = "店铺名称") @RequestParam(name = "shop_name", required = false) String shopName,
@Parameter(description = "商品 ASIN") @RequestParam(name = "asin", required = false) String asin,
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.shopmatch.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCandidateAddRequest;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCountryPreferenceSaveRequest;
@@ -186,9 +187,9 @@ public class ShopMatchController {
public ApiResponse<ShopMatchSkipAsinPageVo> getTaskSkipAsinsPaginated(
@Parameter(description = "任务编号", required = true, example = "200") @PathVariable Long taskId,
@Parameter(description = "页码,从 1 开始", example = "1")
@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "page", defaultValue = PageDefaults.FIRST_PAGE) Integer page,
@Parameter(description = "每页条数,默认 1000,最大 2000", example = "1000")
@RequestParam(value = "page_size", defaultValue = "1000") Integer pageSize,
@RequestParam(value = "page_size", defaultValue = PageDefaults.FULL_EXPORT_PAGE_SIZE) Integer pageSize,
@Parameter(description = "店铺名称过滤条件,可重复传入,也可用英文逗号分隔", example = "测试店铺A")
@RequestParam(value = "shop_name", required = false) List<String> shopNames,
@Parameter(description = "国家代码过滤条件,可重复传入,也可用英文逗号分隔", example = "DE")
@@ -204,7 +204,8 @@ public class ShopMatchTaskService {
Long processed = fileTaskMapper.selectCount(new LambdaQueryWrapper<FileTaskEntity>()
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
.eq(FileTaskEntity::getUserId, userId)
.in(FileTaskEntity::getStatus, List.of("SUCCESS", "FAILED")));
.in(FileTaskEntity::getStatus,
com.nanri.aiimage.common.task.TaskStatuses.FileTask.FINISHED_ORDERED));
Long success = fileTaskMapper.selectCount(new LambdaQueryWrapper<FileTaskEntity>()
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
.eq(FileTaskEntity::getUserId, userId)
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.similarasin.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinFilterConditionAddRequest;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParseRequest;
@@ -129,7 +130,7 @@ public class SimilarAsinController {
@Parameter(description = "当前用户 ID", required = true, example = "1")
@RequestParam("user_id") Long userId,
@Parameter(description = "历史记录条数,默认 50,最大 100", example = "50")
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
@RequestParam(value = "limit", required = false, defaultValue = PageDefaults.DEFAULT_RESULT_LIMIT) Integer limit,
HttpServletRequest httpRequest) {
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
return ApiResponse.success(service.history(userId, limit));
@@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.FailedStatusRowFilter;
import com.nanri.aiimage.common.util.StaleTaskDeathReason;
@@ -877,6 +878,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport().acquireTaskLock(task.getId(), 0L);
if (taskLockHandle == null) {
// 锁被 owner 实例/文件任务 worker 占用说明其仍活跃,静默跳过等下一轮(2 分钟后再判)
LockSkipWitness.recordSkip("similar-asin:heartbeat-stale-scan", MODULE_TYPE, task.getId());
continue;
}
try (taskLockHandle) {
@@ -892,6 +894,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
}
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport().acquireTaskLock(taskId, 0L);
if (taskLockHandle == null) {
LockSkipWitness.recordAbandoned("similar-asin:debug-finalize-stale", MODULE_TYPE, taskId);
return;
}
try (taskLockHandle) {
@@ -1023,6 +1026,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
TaskDistributedLockService.LockHandle neverReportedLock =
ownershipSupport().acquireTaskLock(task.getId(), 0L);
if (neverReportedLock == null) {
LockSkipWitness.recordSkip("similar-asin:never-reported-stale-scan", MODULE_TYPE, task.getId());
continue;
}
try (neverReportedLock) {
@@ -1049,6 +1053,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
}
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport().acquireTaskLock(task.getId(), 0L);
if (taskLockHandle == null) {
LockSkipWitness.recordSkip("similar-asin:no-result-shard-stale-scan", MODULE_TYPE, task.getId());
continue;
}
try (taskLockHandle) {
@@ -1488,6 +1493,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
DistributedJobLockService.LockHandle lockHandle =
distributedJobLockService.tryLock("similar-asin:llm-poll", Duration.ofMinutes(1));
if (lockHandle == null) {
LockSkipWitness.abandoned("similar-asin:llm-poll");
return;
}
try (lockHandle) {
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.similarasin.service.support;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.util.LockSkipWitness;
import cn.hutool.crypto.digest.DigestUtil;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParsedPayloadDto;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultGroupDto;
@@ -984,6 +985,7 @@ public class SimilarAsinPipelineSupport {
taskQueueExecutor.execute(() -> {
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport.acquireTaskLock(taskId, 0L);
if (taskLockHandle == null) {
LockSkipWitness.recordAbandoned("similar-asin:direct-llm-poll-fallback", MODULE_TYPE, taskId);
return;
}
try (taskLockHandle) {
@@ -1014,6 +1016,7 @@ public class SimilarAsinPipelineSupport {
}
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport.acquireTaskLock(taskId, 0L);
if (taskLockHandle == null) {
LockSkipWitness.recordAbandoned("similar-asin:resubmit-pending-llm-states", MODULE_TYPE, taskId);
return;
}
try (taskLockHandle) {
@@ -1484,6 +1487,7 @@ public class SimilarAsinPipelineSupport {
}
TaskDistributedLockService.LockHandle lockHandle = ownershipSupport.acquireTaskLock(taskId, 0L);
if (lockHandle == null) {
LockSkipWitness.recordAbandoned("similar-asin:maybe-finalize-llm-job", MODULE_TYPE, taskId);
return;
}
try (lockHandle) {
@@ -1509,6 +1513,7 @@ public class SimilarAsinPipelineSupport {
DistributedJobLockService.LockHandle lockHandle =
distributedJobLockService.tryLock("similar-asin:llm-finalize:" + taskId, Duration.ofMinutes(5));
if (lockHandle == null) {
LockSkipWitness.recordAbandoned("similar-asin:llm-finalize-job-lock", MODULE_TYPE, taskId);
return;
}
try (lockHandle) {
@@ -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()) {
@@ -39,17 +39,17 @@ public interface TaskCenterQueryMapper {
+ "'SIMILAR_ASIN','COLLECT_DATA','SHOP_DATA_CRAWL'";
/**
* 状态口径的单一来源。{@code @Select} 注解值必须是编译期常量,所以 SQL 里用下面
* 的字符串字面量、Java 侧判卡住用这里的集合,两者由
* {@code TaskCenterQueryMapperSqlTest.statusLiteralsStayInSyncWithSets} 守同步。
* 状态口径的单一来源。{@code @Select} 注解值必须是编译期常量,所以 SQL 里的字符串字面量留在本接口,
* Java 侧判卡住用的集合一律取自 {@link com.nanri.aiimage.common.task.TaskStatuses}(唯一词表),
* 两边由 {@code TaskCenterQueryMapperSqlTest.statusLiteralsStayInSyncWithSets} 守同步。
*/
Set<String> ACTIVE_STATUS_SET = Set.of("PENDING", "RUNNING", "SCHEDULED");
Set<String> ACTIVE_STATUS_SET = com.nanri.aiimage.common.task.TaskStatuses.FileTask.ACTIVE;
/**
* {@link #ACTIVE_STATUS_SET} 的固定顺序版本:前端「在跑」筛选项就是这个集合的合并口径,
* 展开成 IN 列表后 SQL 文本要可断言({@code Set} 的迭代顺序不保证,不能直接下 SQL)。
*/
List<String> ACTIVE_STATUSES_ORDERED = List.of("PENDING", "RUNNING", "SCHEDULED");
List<String> ACTIVE_STATUSES_ORDERED = com.nanri.aiimage.common.task.TaskStatuses.FileTask.ACTIVE_ORDERED;
/** 状态筛选的合并哨兵值:它不是表里的状态,服务层负责展开成 {@link #ACTIVE_STATUSES_ORDERED}。 */
String ACTIVE_STATUS_SENTINEL = "ACTIVE";
@@ -58,19 +58,21 @@ public interface TaskCenterQueryMapper {
* 前端「成功」筛选项的展开口径(2026-10-04 状态三态收敛:只留 执行中/成功/失败):
* COMPLETED 是完成态的历史拼写,展示上已并入成功,筛选必须命中同样的行。
*/
List<String> SUCCESS_STATUSES_ORDERED = List.of("SUCCESS", "COMPLETED");
List<String> SUCCESS_STATUSES_ORDERED =
com.nanri.aiimage.common.task.TaskStatuses.FileTask.SUCCESS_VIEW_ORDERED;
/** 前端「失败」筛选项的展开口径:ERROR 与取消/出错都按「没成功」并入失败(SQL 里 CANCELED 已归一为 CANCELLED)。 */
List<String> FAILED_STATUSES_ORDERED = List.of("FAILED", "ERROR", "CANCELLED");
List<String> FAILED_STATUSES_ORDERED =
com.nanri.aiimage.common.task.TaskStatuses.FileTask.FAILED_VIEW_ORDERED;
/** biz_file_task 终态(CANCELLED 与历史脏值 CANCELED 并存)。 */
Set<String> TERMINAL_STATUS_SET = Set.of("SUCCESS", "FAILED", "CANCELLED", "CANCELED");
Set<String> TERMINAL_STATUS_SET = com.nanri.aiimage.common.task.TaskStatuses.FileTask.TERMINAL;
/** brand_crawl_tasks 进行中(该表状态小写)。 */
Set<String> BRAND_ACTIVE_STATUS_SET = Set.of("pending", "running");
Set<String> BRAND_ACTIVE_STATUS_SET = com.nanri.aiimage.common.task.TaskStatuses.BrandTask.ACTIVE;
/** brand_crawl_tasks 终态。 */
Set<String> BRAND_TERMINAL_STATUS_SET = Set.of("success", "failed", "cancelled");
Set<String> BRAND_TERMINAL_STATUS_SET = com.nanri.aiimage.common.task.TaskStatuses.BrandTask.TERMINAL;
/**
* 逐行把「规范化后的店铺名」写进 {@code biz_file_result.source_filename} 的模块白名单
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.usersecret.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.config.UserSecretProperties;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.service.DataReadScope;
@@ -55,8 +56,8 @@ public class AdminUserApiSecretController {
@Parameter(description = "行级状态筛选:passed/failed/incomplete/error/unknown") @RequestParam(required = false) String checkStatus,
@Parameter(description = "按数据权限分组筛选(仅超管生效)") @RequestParam(name = "group_id", required = false) Long groupId,
@Parameter(description = "按公司筛选(仅超管生效;非超管一律按会话公司裁剪,越界公司为空页)") @RequestParam(name = "company_id", required = false) Long companyId,
@Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize) {
@Parameter(description = "页码") @RequestParam(defaultValue = PageDefaults.FIRST_PAGE) Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = PageDefaults.USER_LIST_PAGE_SIZE) Long pageSize) {
AdminUserEntity operator = adminAuthSupport.requireAdmin(request);
AdminUserSecretQuery query = new AdminUserSecretQuery();
query.setKeyword(keyword);
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.usersecret.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.common.service.ReadScope;
@@ -47,8 +48,8 @@ public class AdminUserSecretUsageController {
@Parameter(description = "关键字:用户名") @RequestParam(required = false) String keyword,
@Parameter(description = "按数据权限分组筛选(仅超管生效)") @RequestParam(name = "group_id", required = false) Long groupId,
@Parameter(description = "按公司筛选(仅超管生效;非超管一律按会话公司裁剪,越界公司为空页)") @RequestParam(name = "company_id", required = false) Long companyId,
@Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize) {
@Parameter(description = "页码") @RequestParam(defaultValue = PageDefaults.FIRST_PAGE) Long page,
@Parameter(description = "每页数量") @RequestParam(defaultValue = PageDefaults.USER_LIST_PAGE_SIZE) Long pageSize) {
AdminUserEntity operator = adminAuthSupport.requireAdmin(request);
AdminUserSecretUsageQuery query = new AdminUserSecretUsageQuery();
query.setStartDate(startDate);
@@ -91,7 +91,8 @@ public class WithdrawTaskService {
validateUserId(userId);
ProductRiskDashboardVo vo = new ProductRiskDashboardVo();
vo.setCandidateCount(withdrawResolveService.countCandidates(userId));
vo.setProcessedTaskCount(countTasks(userId, List.of("SUCCESS", "FAILED")));
vo.setProcessedTaskCount(countTasks(userId,
com.nanri.aiimage.common.task.TaskStatuses.FileTask.FINISHED_ORDERED));
vo.setSuccessTaskCount(countTasks(userId, List.of("SUCCESS")));
vo.setFailedTaskCount(countTasks(userId, List.of("FAILED")));
return vo;