外观专利转 Linux 后台主力执行:activate 不再推送客户端浏览器
- activateTask 改为状态校验:PENDING 保持等 Linux 内部认领,旧前端点启动给出明确提示并中止入队,任务不会重复执行 - 内部认领新增独立等待窗口 internal-min-pending-minutes(默认2分钟),任务创建后快速自动开始 - 客户端兜底拉取默认白名单移除 APPEARANCE_PATENT,防止未来误开时客户端抢抓 - 前端「启动」按钮改「提交后台执行」:不再 enqueue_json 推客户端队列,直接进入轮询
This commit is contained in:
+12
-15
@@ -287,22 +287,19 @@ public class AppearancePatentTaskService {
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || userId != null && !Objects.equals(userId, task.getUserId())) {
|
||||
throw new BusinessException("任务不存在");
|
||||
}
|
||||
ensureTaskOwnedByCurrentInstance(task, "activate");
|
||||
// 只允许 PENDING→RUNNING(条件更新):与客户端「兜底拉取」的原子认领互斥,
|
||||
// 谁先翻转谁执行,避免页面与客户端重复执行同一任务
|
||||
int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper<FileTaskEntity>()
|
||||
.eq(FileTaskEntity::getId, taskId)
|
||||
.eq(FileTaskEntity::getStatus, STATUS_PENDING)
|
||||
.set(FileTaskEntity::getStatus, STATUS_RUNNING)
|
||||
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now()));
|
||||
if (updated == 0) {
|
||||
FileTaskEntity latest = fileTaskMapper.selectById(taskId);
|
||||
if (latest != null && STATUS_RUNNING.equals(latest.getStatus())) {
|
||||
throw new BusinessException("任务已在执行中(可能已由客户端自动接管),无需重复启动");
|
||||
}
|
||||
throw new BusinessException("任务已结束");
|
||||
// 2026-09-30 起外观专利已整体迁移 Linux 后台执行(无浏览器抓取):
|
||||
// activate 不再把任务推给客户端浏览器。任务保持 PENDING,由内部认领端点
|
||||
// (/api/internal/tasks/pull-pending + maixiang-ap worker)在等待窗口后自动接管。
|
||||
// 这里保留接口仅做状态校验:旧前端(未刷新页面缓存)点「启动」时给出明确提示,
|
||||
// 前端收到业务异常会中止入队逻辑,任务不会被执行两次。
|
||||
if (STATUS_PENDING.equals(task.getStatus())) {
|
||||
log.info("[外观专利] activate 不再推送客户端,任务保持 PENDING 等待 Linux 后台认领 taskId={} userId={}", taskId, userId);
|
||||
throw new BusinessException("外观专利已切换后台自动执行,无需打开浏览器,稍候自动开始");
|
||||
}
|
||||
taskCacheService.touchTaskHeartbeat(taskId);
|
||||
if (STATUS_RUNNING.equals(task.getStatus())) {
|
||||
throw new BusinessException("任务已在执行中(可能已由后台自动接管),无需重复启动");
|
||||
}
|
||||
throw new BusinessException("任务已结束");
|
||||
}
|
||||
|
||||
public AppearancePatentDashboardVo dashboard(Long userId) {
|
||||
|
||||
+11
-3
@@ -70,6 +70,14 @@ public class TaskClientPullService {
|
||||
@Value("${aiimage.client-task-pull.internal-enabled:false}")
|
||||
private boolean internalEnabled;
|
||||
|
||||
/**
|
||||
* 内部认领的 PENDING 等待窗口(分钟),独立于客户端兜底拉取口径。
|
||||
* 外观专利已整体迁移 Linux 后台执行(2026-09-30):任务创建后等待这段时间才允许
|
||||
* 内部认领——给「建完任务想立刻删除」的用户留余地,也让旧前端点「启动」的过渡语义平滑。
|
||||
*/
|
||||
@Value("${aiimage.client-task-pull.internal-min-pending-minutes:2}")
|
||||
private long internalMinPendingMinutes;
|
||||
|
||||
public TaskClientPullService(FileTaskMapper fileTaskMapper,
|
||||
InstanceMetadata instanceMetadata,
|
||||
List<ClientTaskPullSpi> handlers) {
|
||||
@@ -101,8 +109,8 @@ public class TaskClientPullService {
|
||||
*/
|
||||
@PostConstruct
|
||||
public void logEffectiveConfig() {
|
||||
log.info("[client-task-pull] 生效配置 enabled={} internalEnabled={} moduleTypes={} minPendingMinutes={} limit={} handlers={}",
|
||||
enabled, internalEnabled, moduleTypes, minPendingMinutes, Math.max(1, Math.min(limit, MAX_LIMIT)), pullHandlers.keySet());
|
||||
log.info("[client-task-pull] 生效配置 enabled={} internalEnabled={} internalMinPendingMinutes={} moduleTypes={} minPendingMinutes={} limit={} handlers={}",
|
||||
enabled, internalEnabled, internalMinPendingMinutes, moduleTypes, minPendingMinutes, Math.max(1, Math.min(limit, MAX_LIMIT)), pullHandlers.keySet());
|
||||
}
|
||||
|
||||
/** 拉取并认领该用户"长期未被领取"的任务,按创建时间升序返回,最多 limit 条。 */
|
||||
@@ -153,7 +161,7 @@ public class TaskClientPullService {
|
||||
return List.of();
|
||||
}
|
||||
long startedAt = System.currentTimeMillis();
|
||||
LocalDateTime cutoff = LocalDateTime.now(DB_ZONE).minusMinutes(Math.max(1L, minPendingMinutes));
|
||||
LocalDateTime cutoff = LocalDateTime.now(DB_ZONE).minusMinutes(Math.max(1L, internalMinPendingMinutes));
|
||||
int safeLimit = Math.max(1, Math.min(limit, MAX_LIMIT));
|
||||
List<FileTaskEntity> candidates = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
|
||||
.select(FileTaskEntity::getId, FileTaskEntity::getModuleType, FileTaskEntity::getCreatedAt)
|
||||
|
||||
@@ -288,12 +288,17 @@ aiimage:
|
||||
# 默认关闭;打开前需先发布带兜底拉取线程的客户端版本,旧客户端不受影响。
|
||||
client-task-pull:
|
||||
enabled: ${AIIMAGE_CLIENT_TASK_PULL_ENABLED:false}
|
||||
module-types: ${AIIMAGE_CLIENT_TASK_PULL_MODULE_TYPES:SIMILAR_ASIN,COLLECT_DATA,APPEARANCE_PATENT}
|
||||
# 2026-09-30 外观专利已迁移 Linux 后台执行(内部认领),不再由客户端浏览器兜底执行,
|
||||
# 因此默认白名单移除 APPEARANCE_PATENT,防止未来误开 enabled 时客户端又抢着抓取。
|
||||
module-types: ${AIIMAGE_CLIENT_TASK_PULL_MODULE_TYPES:SIMILAR_ASIN,COLLECT_DATA}
|
||||
min-pending-minutes: ${AIIMAGE_CLIENT_TASK_PULL_MIN_PENDING_MINUTES:5}
|
||||
limit: ${AIIMAGE_CLIENT_TASK_PULL_LIMIT:5}
|
||||
# 服务端内部认领(/api/internal/tasks/pull-pending,Linux 后台 worker 专用),
|
||||
# 与客户端兜底拉取开关独立:外观专利详情页抓取迁 Linux 时单独打开即可。
|
||||
internal-enabled: ${AIIMAGE_CLIENT_TASK_PULL_INTERNAL_ENABLED:false}
|
||||
# 内部认领的 PENDING 等待窗口(分钟):任务创建后等待这段时间才允许 Linux worker 认领,
|
||||
# 留出「建完任务想立刻删除」的余地,也让旧前端点「启动」的过渡语义平滑。
|
||||
internal-min-pending-minutes: ${AIIMAGE_CLIENT_TASK_PULL_INTERNAL_MIN_PENDING_MINUTES:2}
|
||||
# 客户端中断任务的自动续跑(V129):客户端被更新脚本/任务管理器杀掉时,在跑的任务会被
|
||||
# 客户端启动时上报中断并标 FAILED(用户能看到真实原因),这里把这些任务重新排队成 PENDING,
|
||||
# 由上面的兜底拉取通道交给在线客户端继续跑——长任务不再因为一次客户端更新就整个白跑。
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
{{ parsing ? '解析中...' : '解析并创建任务' }}
|
||||
</button>
|
||||
<button type="button" class="btn-run btn-queue" :disabled="pushing || !parseResult?.taskId" @click="pushToPythonQueue">
|
||||
{{ pushing ? '启动中...' : '启动任务' }}
|
||||
{{ pushing ? '提交中...' : '提交后台执行' }}
|
||||
</button>
|
||||
</div>
|
||||
<p class="loading-msg">提交后系统自动分批检测,进度显示在右侧任务区,完成后可下载结果。</p>
|
||||
@@ -81,16 +81,13 @@ import ModuleTemplateDownload from '@/shared/components/ModuleTemplateDownload.v
|
||||
import TaskCenterPanel from '@/shared/components/tasks/TaskCenterPanel.vue'
|
||||
import type { TaskItemView, TaskStatCard } from '@/shared/components/tasks/types'
|
||||
import {
|
||||
activateAppearancePatentTask,
|
||||
deleteAppearancePatentHistory,
|
||||
deleteAppearancePatentTask,
|
||||
getAppearancePatentDashboard,
|
||||
getAppearancePatentHistory,
|
||||
getAppearancePatentQueuePayload,
|
||||
getAppearancePatentResultDownloadUrl,
|
||||
getAppearancePatentTaskProgressBatch,
|
||||
parseAppearancePatent,
|
||||
type AppearancePatentParsedPayloadDto,
|
||||
type AppearancePatentDashboardVo,
|
||||
type AppearancePatentHistoryItem,
|
||||
type AppearancePatentParseVo,
|
||||
@@ -106,7 +103,6 @@ import { saveUrlWithProgress } from '@/shared/utils/download-progress'
|
||||
import {
|
||||
EXCEL_EXTENSIONS,
|
||||
checkParseResult,
|
||||
checkQueuePayload,
|
||||
checkSelectedFiles,
|
||||
} from '@/shared/dispatch-guard'
|
||||
import { passGuard } from '@/shared/dispatch-guard-ui'
|
||||
@@ -252,10 +248,6 @@ function effectiveAiPrompt() {
|
||||
return aiPrompt.value.trim()
|
||||
}
|
||||
|
||||
function queueAiPrompt() {
|
||||
return aiPrompt.value.trim()
|
||||
}
|
||||
|
||||
function effectiveLlmApiKey() {
|
||||
return getStoredApiSecret('appearance-patent').trim()
|
||||
}
|
||||
@@ -427,87 +419,23 @@ async function parseFiles() {
|
||||
}
|
||||
|
||||
async function pushToPythonQueue() {
|
||||
const api = getPywebviewApi()
|
||||
const currentParseResult = parseResult.value
|
||||
const taskId = currentParseResult?.taskId
|
||||
if (!taskId) {
|
||||
ElMessage.warning('请先解析文件')
|
||||
return
|
||||
}
|
||||
if (!api?.enqueue_json) {
|
||||
ElMessage.error('当前环境未启用 pywebview enqueue_json')
|
||||
return
|
||||
}
|
||||
if (!effectiveLlmApiKey()) {
|
||||
// 本地无明文不再阻断:服务端已保存该用户密钥,任务执行时按 uid 兜底读取
|
||||
console.log('[appearance-patent] 本地无密钥明文,启动任务由服务端兜底')
|
||||
}
|
||||
// 2026-09-30 外观专利已迁移 Linux 后台执行(无浏览器抓取):
|
||||
// 「启动」不再推送客户端队列,任务保持 PENDING,由服务端内部认领
|
||||
// (/api/internal/tasks/pull-pending + 主机B maixiang-ap worker)在等待窗口后自动接管。
|
||||
pushing.value = true
|
||||
try {
|
||||
const parsedPayload: AppearancePatentParsedPayloadDto = await getAppearancePatentQueuePayload(taskId)
|
||||
const groups = parsedPayload.groups || []
|
||||
const payload = {
|
||||
type: 'appearance-patent-run',
|
||||
ts: Date.now(),
|
||||
data: {
|
||||
taskId,
|
||||
prompt: queueAiPrompt(),
|
||||
api_key: effectiveLlmApiKey(),
|
||||
sourceFileCount: currentParseResult.sourceFileCount || 0,
|
||||
totalRows: currentParseResult.totalRows || 0,
|
||||
acceptedRows: currentParseResult.acceptedRows || 0,
|
||||
groupCount: currentParseResult.groupCount || 0,
|
||||
groups: groups.map((group) => ({
|
||||
sourceFileKey: group.sourceFileKey || '',
|
||||
sourceFilename: group.sourceFilename || '',
|
||||
groupKey: group.groupKey || '',
|
||||
baseId: group.baseId || '',
|
||||
displayId: group.displayId || '',
|
||||
items: (group.items || []).map((row) => ({
|
||||
sourceFileKey: row.sourceFileKey || '',
|
||||
sourceFilename: row.sourceFilename || '',
|
||||
rowToken: row.rowToken || '',
|
||||
groupKey: row.groupKey || '',
|
||||
id: row.displayId,
|
||||
asin: row.asin,
|
||||
country: row.country,
|
||||
sku: row.sku || '',
|
||||
url: row.url || '',
|
||||
title: row.title || '',
|
||||
})),
|
||||
})),
|
||||
},
|
||||
}
|
||||
queuePayloadText.value = `任务 ${taskId} 已准备启动,共 ${groups.length} 组`
|
||||
// 后端返回的 groups 为空时推送出去,Python 端没有可执行批次会一直停在执行中
|
||||
const guard = checkQueuePayload(payload, {
|
||||
expectedType: 'appearance-patent-run',
|
||||
// api_key 不列为必填:密钥已服务端化,本地无明文时由服务端按 uid 兜底
|
||||
// (Java AppearancePatentTaskService.readApiKey),列必填会把这类用户全部拦下
|
||||
requiredDataKeys: ['taskId'],
|
||||
nonEmptyArrayKeys: ['groups'],
|
||||
})
|
||||
if (!(await passGuard(guard))) return
|
||||
// 任务可能已被客户端「兜底拉取」领走(页面长时间没点启动):服务端会拒绝 activate,
|
||||
// 此时必须直接返回,不能再入队,否则同一任务会被执行两次
|
||||
try {
|
||||
await activateAppearancePatentTask(taskId)
|
||||
} catch (activateError) {
|
||||
ElMessage.warning(activateError instanceof Error ? activateError.message : '任务已在执行中,无需重复启动')
|
||||
await Promise.all([loadDashboard(), loadHistory({ force: true })])
|
||||
return
|
||||
}
|
||||
const result = await api.enqueue_json(payload)
|
||||
if (!result?.success) {
|
||||
ElMessage.error(result?.error || '启动失败')
|
||||
return
|
||||
}
|
||||
queuedTaskSummary.value = toTaskSummary(currentParseResult)
|
||||
addPollingTask(taskId)
|
||||
clearParsedTask()
|
||||
await loadDashboard()
|
||||
await loadHistory({ force: true })
|
||||
ElMessage.success('已启动任务')
|
||||
ElMessage.success('已提交,后台自动执行中(无需打开浏览器)')
|
||||
} finally {
|
||||
pushing.value = false
|
||||
}
|
||||
@@ -802,7 +730,7 @@ function hasMeaningfulProgressValue(value: unknown) {
|
||||
function statusText(item: AppearancePatentHistoryItem) {
|
||||
const status = normalizeTaskStatus(item)
|
||||
if (status === 'RUNNING') return '执行中'
|
||||
if (status === 'PENDING') return '已解析待启动'
|
||||
if (status === 'PENDING') return '已解析,等待后台执行'
|
||||
// 已判死(含心跳超时)的任务始终显示失败:后台检测可能仍在跑、文件生成后下载按钮会自动出现,
|
||||
// 但状态文案不能是"结果生成中",否则用户会以为任务还在执行(2026-09-28 29473/29479)
|
||||
if (status === 'FAILED') return isResultBuildFailed(item) ? '结果生成失败' : '失败'
|
||||
|
||||
Reference in New Issue
Block a user