fix(phase-5.2): 消项 CR 第二轮 P1/P2/P3(通道/证据链/交付时序/后管证据页)
This commit is contained in:
+2
-2
@@ -59,7 +59,7 @@ public class AppearancePatentController {
|
||||
}
|
||||
|
||||
@GetMapping("/tasks/{taskId}/queue-payload")
|
||||
@Operation(summary = "获取外观专利 Python 队列载荷", description = "本地采集模式下,前端取出 groups 后推本机客户端队列;只返回 Python 当前需要的分组,避免前端搬运完整解析大数据。")
|
||||
@Operation(summary = "获取外观专利 Python 队列载荷", description = "本地采集模式下,前端取出 groups 后推本机客户端队列;只返回 Python 当前需要的分组,避免前端搬运完整解析大数据。这一单登记为线上采集时拒发(V183 通道),防旧页面缓存推本机与后台双跑。")
|
||||
public ApiResponse<AppearancePatentParsedPayloadDto> queuePayload(
|
||||
@Parameter(description = "外观专利任务 ID", required = true, example = "7004")
|
||||
@PathVariable Long taskId,
|
||||
@@ -67,7 +67,7 @@ public class AppearancePatentController {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.queuePayload(taskId, userId));
|
||||
return ApiResponse.success(service.queuePayloadForLocalClient(taskId, userId));
|
||||
}
|
||||
|
||||
@GetMapping("/dashboard")
|
||||
|
||||
+10
-13
@@ -114,13 +114,6 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
|
||||
@org.springframework.beans.factory.annotation.Autowired(required = false)
|
||||
private com.nanri.aiimage.modules.usersecret.service.UserTaskGuardService taskGuard;
|
||||
|
||||
/**
|
||||
* 采集路由开关:字段注入的理由同 {@code taskGuard}——本类构造器被 golden 用例按参数顺序
|
||||
* new 出来,加参数会连带改一批测试。null=未注入(单测)时按「非本地」处理,退回后台语义。
|
||||
*/
|
||||
@org.springframework.beans.factory.annotation.Autowired(required = false)
|
||||
private com.nanri.aiimage.config.CollectRoutingProperties collectRoutingProperties;
|
||||
|
||||
/**
|
||||
* 参数顺序=迁移前 {@code @RequiredArgsConstructor} 的字段声明顺序,一字未动;
|
||||
* 其中五枚(fileTaskMapper/fileResultMapper/taskDistributedLockService/
|
||||
@@ -218,10 +211,10 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
|
||||
FileTaskEntity channelTask = requireSubmissionTask(taskId);
|
||||
if (com.nanri.aiimage.modules.task.model.CollectChannel
|
||||
.resolve(channelTask.getCollectChannel(), channelTask.getModuleType()).isLocal()) {
|
||||
activateForLocalClient(taskId, userId);
|
||||
activateForLocalClient(channelTask, userId);
|
||||
return;
|
||||
}
|
||||
recordSupport().activateTask(taskId, userId);
|
||||
recordSupport().activateTask(channelTask, userId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -230,10 +223,9 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
|
||||
* <p>与客户端兜底拉取 / Linux 内部认领共用同一条原子翻转,谁先翻谁执行,
|
||||
* 页面推送与后台接管不会重复跑同一份任务。
|
||||
*/
|
||||
private void activateForLocalClient(Long taskId, Long userId) {
|
||||
// 模块归属走底座 requireSubmissionTask(TaskFinalizeSupport 家族),不在本类手抄
|
||||
// 「!MODULE_TYPE.equals(...)」——那形已被 TaskLifecycleDebtRatchetTest 钉成只降不升。
|
||||
FileTaskEntity task = requireSubmissionTask(taskId);
|
||||
private void activateForLocalClient(FileTaskEntity task, Long userId) {
|
||||
// 模块归属已在 activateTask 的首读校验过;这里复用同一行,不再二次 selectById。
|
||||
Long taskId = task.getId();
|
||||
if (userId == null || !java.util.Objects.equals(userId, task.getUserId())) {
|
||||
throw new com.nanri.aiimage.common.exception.BusinessException("任务不存在");
|
||||
}
|
||||
@@ -793,6 +785,11 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
|
||||
return payloadSupport().queuePayload(taskId, userId);
|
||||
}
|
||||
|
||||
/** 页面/直连 API 取本机队列载荷:本单通道不是本机时拒发(P1-1 同族)。 */
|
||||
public AppearancePatentParsedPayloadDto queuePayloadForLocalClient(Long taskId, Long userId) {
|
||||
return payloadSupport().queuePayloadForLocalClient(taskId, userId);
|
||||
}
|
||||
|
||||
static String resolveTaskExecutionStatus(boolean waitingForAssemble, boolean executionFailed) {
|
||||
if (waitingForAssemble) {
|
||||
return STATUS_RUNNING;
|
||||
|
||||
+21
@@ -11,6 +11,7 @@ import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentParse
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
|
||||
import com.nanri.aiimage.modules.task.model.CollectChannel;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskChunkEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity;
|
||||
@@ -153,11 +154,31 @@ public class AppearancePatentPayloadSupport {
|
||||
}
|
||||
|
||||
public AppearancePatentParsedPayloadDto queuePayload(Long taskId, Long userId) {
|
||||
return queuePayload(taskId, userId, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* 页面/直连 API 侧的下发口:只有这一单确实交给本机客户端时才给载荷。
|
||||
*
|
||||
* <p>P1-1 的同族洞:取载荷这一侧原先只看存在与归属、不看通道,选了线上的单被旧页面缓存
|
||||
* 或直连 API 取走 groups 推本机,就与 Linux 那边同时跑同一组(按次付费的出口 IP 买两遍)。
|
||||
* 兜底拉取/内部认领走的是 {@link #queuePayload(Long, Long)}:本机单等满兜底窗口后由
|
||||
* Linux 接管,那一侧必须仍能拿到载荷。
|
||||
*/
|
||||
public AppearancePatentParsedPayloadDto queuePayloadForLocalClient(Long taskId, Long userId) {
|
||||
return queuePayload(taskId, userId, true);
|
||||
}
|
||||
|
||||
private AppearancePatentParsedPayloadDto queuePayload(Long taskId, Long userId, boolean requireLocalChannel) {
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
if (task == null || !moduleType.equals(task.getModuleType()) || !Objects.equals(userId, task.getUserId())) {
|
||||
throw new BusinessException("任务不存在");
|
||||
}
|
||||
ownershipChecker.accept(task, "queue payload");
|
||||
if (requireLocalChannel
|
||||
&& !CollectChannel.resolve(task.getCollectChannel(), task.getModuleType()).isLocal()) {
|
||||
throw new BusinessException("本单已选择线上采集,无需打开客户端,提交后稍候自动开始");
|
||||
}
|
||||
AppearancePatentParsedPayloadDto payload = readParsedPayload(task);
|
||||
AppearancePatentParsedPayloadDto queuePayload = new AppearancePatentParsedPayloadDto();
|
||||
queuePayload.setAiPrompt(payload.getAiPrompt());
|
||||
|
||||
+10
-8
@@ -70,18 +70,20 @@ public class AppearancePatentTaskRecordSupport {
|
||||
}
|
||||
|
||||
public void activateTask(Long taskId, Long userId) {
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
activateTask(fileTaskMapper.selectById(taskId), userId);
|
||||
}
|
||||
|
||||
/** P3-4:调用方已经读过任务行时复用,不在 activate 链路上重复 selectById。 */
|
||||
public void activateTask(FileTaskEntity task, Long userId) {
|
||||
Long taskId = task == null ? null : task.getId();
|
||||
if (task == null || !moduleType.equals(task.getModuleType()) || !Objects.equals(userId, task.getUserId())) {
|
||||
throw new BusinessException("任务不存在");
|
||||
}
|
||||
// 2026-09-30 起外观专利已整体迁移 Linux 后台执行(无浏览器抓取):
|
||||
// activate 不再把任务推给客户端浏览器。任务保持 PENDING,由内部认领端点
|
||||
// (/api/internal/tasks/pull-pending + maixiang-ap worker)在等待窗口后自动接管。
|
||||
// 这里保留接口仅做状态校验:旧前端(未刷新页面缓存)点「启动」时给出明确提示,
|
||||
// 前端收到业务异常会中止入队逻辑,任务不会被执行两次。
|
||||
// V183 起执行方按单判定:本机单由客户端领取,线上单等内部认领(Linux/外机 Windows)。
|
||||
// 这条兼容分支只服务未刷新页面缓存的旧前端:选中线上采集时,告诉用户无需打开浏览器。
|
||||
if (STATUS_PENDING.equals(task.getStatus())) {
|
||||
log.info("[外观专利] activate 不再推送客户端,任务保持 PENDING 等待 Linux 后台认领 taskId={} userId={}", taskId, userId);
|
||||
throw new BusinessException("外观专利已切换后台自动执行,无需打开浏览器,稍候自动开始");
|
||||
log.info("[外观专利] activate 不再推送客户端,任务保持 PENDING 等待线上认领 taskId={} userId={}", taskId, userId);
|
||||
throw new BusinessException("本单已选择线上采集,无需打开客户端,提交后稍候自动开始");
|
||||
}
|
||||
if (STATUS_RUNNING.equals(task.getStatus())) {
|
||||
throw new BusinessException("任务已在执行中(可能已由后台自动接管),无需重复启动");
|
||||
|
||||
Reference in New Issue
Block a user