task-98: 移除 similar-asin/appearance-patent 模块 Coze,状态机与共享组件改名 LLM
- similarasin/appearancepatent 模块全部 Coze 工作流调用改走 direct-LLM(已确认唯一运行路径) - 共享组件改名:CozeTaskQueueGate→TaskQueueGate、CozeGroupResultPropagator→GroupResultPropagator - 状态机改名:biz_task_scope_state 的 coze_* 列→llm_*、stateJson coze 键→llm(V100 迁移已应用生产) - 删除 biz_coze_credential 表、CozeCredential* 类、SimilarAsinCozeClient、AppearancePatentCozeClient→LlmClient - 前端 brand 页 Coze 文案→LLM;Python 后端删除 cozepy 依赖与死配置 - 修复 TaskResultFileJobWorker 启动失败:TaskFileJobConfig 注册 ResultFileJobHandlerRegistry 与 13 个 handler bean(含 validateCoverage 启动校验)
This commit is contained in:
+1
-1
@@ -8,7 +8,7 @@ import lombok.Data;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* P2-12:图片缩略图缓存。配合 {@code SimilarAsinImagePrefetchService} 跨任务复用 Coze
|
||||
* P2-12:图片缩略图缓存。配合 {@code SimilarAsinImagePrefetchService} 跨任务复用 LLM
|
||||
* 回包中的 main_url / puzzle_img 图片,避免 assemble 阶段每次都重新下载。
|
||||
*
|
||||
* <p>对应表 {@code biz_task_image_cache}(migration V53)。
|
||||
|
||||
+7
-7
@@ -19,13 +19,13 @@ public class TaskScopeStateEntity {
|
||||
private String scopeHash;
|
||||
private String parsedPayloadJson;
|
||||
private String stateJson;
|
||||
private String cozeExecuteId;
|
||||
private String cozeStatus;
|
||||
private LocalDateTime cozeSubmittedAt;
|
||||
private LocalDateTime cozeLastPolledAt;
|
||||
private LocalDateTime cozeCompletedAt;
|
||||
private Integer cozeAttemptCount;
|
||||
private String cozeError;
|
||||
private String llmExecuteId;
|
||||
private String llmStatus;
|
||||
private LocalDateTime llmSubmittedAt;
|
||||
private LocalDateTime llmLastPolledAt;
|
||||
private LocalDateTime llmCompletedAt;
|
||||
private Integer llmAttemptCount;
|
||||
private String llmError;
|
||||
private Integer chunkTotal;
|
||||
private Integer receivedChunkCount;
|
||||
private Integer completed;
|
||||
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* APPEARANCE_PATENT 结果文件 Job Handler(04 注册表)。
|
||||
* process 返回 Service 的 boolean(false=等待 coze 异步结果,Worker 保持运行心跳);
|
||||
* cleanup 委托 cleanupResultFileJob;支持异步 offload;owner scoped。
|
||||
*/
|
||||
public class AppearancePatentResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final AppearancePatentTaskService appearancePatentTaskService;
|
||||
|
||||
public AppearancePatentResultFileJobHandler(AppearancePatentTaskService appearancePatentTaskService) {
|
||||
this.appearancePatentTaskService = appearancePatentTaskService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "APPEARANCE_PATENT";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
return appearancePatentTaskService.processResultFileJob(job);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
appearancePatentTaskService.cleanupResultFileJob(job);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsAsyncOffload() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOwnerScoped() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.brand.service.BrandTaskService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* BRAND 结果文件 Job Handler(04 注册表)。
|
||||
* 注意:resultFileUrl 解析特例(resolveResultObjectKey,无 resultId 也走)
|
||||
* 保留在 Worker 公共路径 resolveResultFileUrl,Handler 不接管 URL 解析;
|
||||
* cleanup 为空(原 cleanupAfterSuccess 无 BRAND 分支)。
|
||||
*/
|
||||
public class BrandResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final BrandTaskService brandTaskService;
|
||||
private final TaskResultPayloadService taskResultPayloadService;
|
||||
|
||||
public BrandResultFileJobHandler(BrandTaskService brandTaskService,
|
||||
TaskResultPayloadService taskResultPayloadService) {
|
||||
this.brandTaskService = brandTaskService;
|
||||
this.taskResultPayloadService = taskResultPayloadService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "BRAND";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
brandTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.collectdata.service.CollectDataService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* COLLECT_DATA 结果文件 Job Handler(04 注册表)。
|
||||
* cleanup 为空(原 cleanupAfterSuccess 无 COLLECT_DATA 分支)。
|
||||
*/
|
||||
public class CollectDataResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final CollectDataService collectDataService;
|
||||
|
||||
public CollectDataResultFileJobHandler(CollectDataService collectDataService) {
|
||||
this.collectDataService = collectDataService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "COLLECT_DATA";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
collectDataService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* DELETE_BRAND 结果文件 Job Handler(04 注册表)。
|
||||
*/
|
||||
public class DeleteBrandResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final DeleteBrandRunService deleteBrandRunService;
|
||||
|
||||
public DeleteBrandResultFileJobHandler(DeleteBrandRunService deleteBrandRunService) {
|
||||
this.deleteBrandRunService = deleteBrandRunService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "DELETE_BRAND";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
deleteBrandRunService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
deleteBrandRunService.cleanupResultFileJob(job);
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.patroldelete.service.PatrolDeleteTaskService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* PATROL_DELETE 结果文件 Job Handler(04 注册表)。
|
||||
*/
|
||||
public class PatrolDeleteResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final PatrolDeleteTaskService patrolDeleteTaskService;
|
||||
private final TaskResultPayloadService taskResultPayloadService;
|
||||
|
||||
public PatrolDeleteResultFileJobHandler(PatrolDeleteTaskService patrolDeleteTaskService,
|
||||
TaskResultPayloadService taskResultPayloadService) {
|
||||
this.patrolDeleteTaskService = patrolDeleteTaskService;
|
||||
this.taskResultPayloadService = taskResultPayloadService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "PATROL_DELETE";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
patrolDeleteTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
taskResultPayloadService.deleteLatest(job.getTaskId(), job.getModuleType(), job.getScopeKey());
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.pricetrack.service.PriceTrackTaskService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* PRICE_TRACK 结果文件 Job Handler(04 注册表)。
|
||||
*/
|
||||
public class PriceTrackResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final PriceTrackTaskService priceTrackTaskService;
|
||||
private final TaskResultPayloadService taskResultPayloadService;
|
||||
|
||||
public PriceTrackResultFileJobHandler(PriceTrackTaskService priceTrackTaskService,
|
||||
TaskResultPayloadService taskResultPayloadService) {
|
||||
this.priceTrackTaskService = priceTrackTaskService;
|
||||
this.taskResultPayloadService = taskResultPayloadService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "PRICE_TRACK";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
priceTrackTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
taskResultPayloadService.deleteLatest(job.getTaskId(), job.getModuleType(), job.getScopeKey());
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.productrisk.service.ProductRiskTaskService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* PRODUCT_RISK_RESOLVE 结果文件 Job Handler(04 注册表)。
|
||||
*/
|
||||
public class ProductRiskResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final ProductRiskTaskService productRiskTaskService;
|
||||
private final TaskResultPayloadService taskResultPayloadService;
|
||||
|
||||
public ProductRiskResultFileJobHandler(ProductRiskTaskService productRiskTaskService,
|
||||
TaskResultPayloadService taskResultPayloadService) {
|
||||
this.productRiskTaskService = productRiskTaskService;
|
||||
this.taskResultPayloadService = taskResultPayloadService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "PRODUCT_RISK_RESOLVE";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
productRiskTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
taskResultPayloadService.deleteLatest(job.getTaskId(), job.getModuleType(), job.getScopeKey());
|
||||
}
|
||||
}
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.publish.service.PublishTaskService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* PUBLISH 结果文件 Job Handler(04 注册表)。
|
||||
* cleanup 委托 PublishTaskService.cleanupResultFileJob(不走 payload.deleteLatest);
|
||||
* owner scoped:scopeKey :owner: 判定归属实例。
|
||||
*/
|
||||
public class PublishResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final PublishTaskService publishTaskService;
|
||||
|
||||
public PublishResultFileJobHandler(PublishTaskService publishTaskService) {
|
||||
this.publishTaskService = publishTaskService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return PublishTaskService.MODULE_TYPE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
publishTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
publishTaskService.cleanupResultFileJob(job);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOwnerScoped() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.queryasin.service.QueryAsinTaskService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* QUERY_ASIN 结果文件 Job Handler(04 注册表)。
|
||||
*/
|
||||
public class QueryAsinResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final QueryAsinTaskService queryAsinTaskService;
|
||||
private final TaskResultPayloadService taskResultPayloadService;
|
||||
|
||||
public QueryAsinResultFileJobHandler(QueryAsinTaskService queryAsinTaskService,
|
||||
TaskResultPayloadService taskResultPayloadService) {
|
||||
this.queryAsinTaskService = queryAsinTaskService;
|
||||
this.taskResultPayloadService = taskResultPayloadService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "QUERY_ASIN";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
queryAsinTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
taskResultPayloadService.deleteLatest(job.getTaskId(), job.getModuleType(), job.getScopeKey());
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* 结果文件 Job 处理 Handler(04 注册表)。
|
||||
* 契约:moduleType 全库唯一,重复注册启动即失败;
|
||||
* process 返回 true=处理完成,false=等待异步结果(仅 llm 模块);
|
||||
* onSuccess 在 markSuccess 之后调用(原 finalizeWithdraw 时机,如 WITHDRAW 的 tryFinalizeTask);
|
||||
* cleanup 在 Job 成功后调用(原 cleanupAfterSuccess 分支);
|
||||
* onFailure 在重试耗尽时调用(原 notifyRetryExhausted 分支);
|
||||
* supportsAsyncOffload 对应原 llm offload 判定;
|
||||
* isOwnerScoped 对应原 :owner: 归属实例判定。
|
||||
*/
|
||||
public interface ResultFileJobHandler {
|
||||
|
||||
String moduleType();
|
||||
|
||||
boolean process(TaskFileJobEntity job);
|
||||
|
||||
default void onSuccess(TaskFileJobEntity job) {
|
||||
}
|
||||
|
||||
default void cleanup(TaskFileJobEntity job) {
|
||||
}
|
||||
|
||||
default void onFailure(TaskFileJobEntity job, String message) {
|
||||
}
|
||||
|
||||
default boolean supportsAsyncOffload() {
|
||||
return false;
|
||||
}
|
||||
|
||||
default boolean isOwnerScoped() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
+62
@@ -0,0 +1,62 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* ResultFileJobHandler 注册表(04 注册表)。
|
||||
* 构造时收集全部 Handler 并构建 moduleType→handler 映射;
|
||||
* moduleType 重复即启动失败(fail-fast,消息含模块名)。
|
||||
*/
|
||||
public class ResultFileJobHandlerRegistry {
|
||||
|
||||
private final Map<String, ResultFileJobHandler> handlersByModuleType;
|
||||
|
||||
public ResultFileJobHandlerRegistry(List<ResultFileJobHandler> handlers) {
|
||||
Map<String, ResultFileJobHandler> map = new LinkedHashMap<>();
|
||||
for (ResultFileJobHandler handler : handlers) {
|
||||
String moduleType = handler.moduleType();
|
||||
if (map.containsKey(moduleType)) {
|
||||
throw new IllegalStateException("Handler 模块类型重复注册:" + moduleType);
|
||||
}
|
||||
map.put(moduleType, handler);
|
||||
}
|
||||
this.handlersByModuleType = Collections.unmodifiableMap(map);
|
||||
}
|
||||
|
||||
public ResultFileJobHandler resolve(String moduleType) {
|
||||
ResultFileJobHandler handler = handlersByModuleType.get(moduleType);
|
||||
if (handler == null) {
|
||||
throw new IllegalArgumentException("unsupported result file job module: " + moduleType);
|
||||
}
|
||||
return handler;
|
||||
}
|
||||
|
||||
public Set<String> moduleTypes() {
|
||||
return handlersByModuleType.keySet();
|
||||
}
|
||||
|
||||
public Map<String, ResultFileJobHandler> asMap() {
|
||||
return handlersByModuleType;
|
||||
}
|
||||
|
||||
/**
|
||||
* 启动 fail-fast 校验:expected 中每个 moduleType 都必须有且仅有一个 Handler,
|
||||
* 缺失时抛 IllegalStateException 并列出缺失清单。
|
||||
*/
|
||||
public void validateCoverage(Set<String> expectedModuleTypes) {
|
||||
List<String> missing = new ArrayList<>();
|
||||
for (String moduleType : expectedModuleTypes) {
|
||||
if (!handlersByModuleType.containsKey(moduleType)) {
|
||||
missing.add(moduleType);
|
||||
}
|
||||
}
|
||||
if (!missing.isEmpty()) {
|
||||
throw new IllegalStateException("结果文件 Job Handler 缺失注册:" + String.join(", ", missing));
|
||||
}
|
||||
}
|
||||
}
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlTaskService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* SHOP_DATA_CRAWL 结果文件 Job Handler(04 注册表)。
|
||||
* cleanup 两处:payload.deleteLatest + 服务内 cleanupResultFileJob(原分支语义);
|
||||
* onFailure 委托 handleResultFileJobFailure(重试耗尽回调);owner scoped。
|
||||
*/
|
||||
public class ShopDataCrawlResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final ShopDataCrawlTaskService shopDataCrawlTaskService;
|
||||
private final TaskResultPayloadService taskResultPayloadService;
|
||||
|
||||
public ShopDataCrawlResultFileJobHandler(ShopDataCrawlTaskService shopDataCrawlTaskService,
|
||||
TaskResultPayloadService taskResultPayloadService) {
|
||||
this.shopDataCrawlTaskService = shopDataCrawlTaskService;
|
||||
this.taskResultPayloadService = taskResultPayloadService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "SHOP_DATA_CRAWL";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
shopDataCrawlTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
taskResultPayloadService.deleteLatest(job.getTaskId(), job.getModuleType(), job.getScopeKey());
|
||||
shopDataCrawlTaskService.cleanupResultFileJob(job);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(TaskFileJobEntity job, String message) {
|
||||
shopDataCrawlTaskService.handleResultFileJobFailure(job, message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOwnerScoped() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.shopmatch.service.ShopMatchTaskService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* SHOP_MATCH 结果文件 Job Handler(04 注册表)。
|
||||
* process 委托 ShopMatchTaskService.processResultFileJob;
|
||||
* cleanup 删除该任务最新 payload(原 cleanupAfterSuccess 分支语义)。
|
||||
*/
|
||||
public class ShopMatchResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final ShopMatchTaskService shopMatchTaskService;
|
||||
private final TaskResultPayloadService taskResultPayloadService;
|
||||
|
||||
public ShopMatchResultFileJobHandler(ShopMatchTaskService shopMatchTaskService,
|
||||
TaskResultPayloadService taskResultPayloadService) {
|
||||
this.shopMatchTaskService = shopMatchTaskService;
|
||||
this.taskResultPayloadService = taskResultPayloadService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "SHOP_MATCH";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
shopMatchTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
taskResultPayloadService.deleteLatest(job.getTaskId(), job.getModuleType(), job.getScopeKey());
|
||||
}
|
||||
}
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.similarasin.service.SimilarAsinTaskService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
|
||||
/**
|
||||
* SIMILAR_ASIN 结果文件 Job Handler(04 注册表)。
|
||||
* process 返回 Service 的 boolean(false=等待 llm 异步结果);
|
||||
* onFailure 委托 handleResultFileJobFailure(重试耗尽回调);异步 offload;owner scoped。
|
||||
*/
|
||||
public class SimilarAsinResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final SimilarAsinTaskService similarAsinTaskService;
|
||||
|
||||
public SimilarAsinResultFileJobHandler(SimilarAsinTaskService similarAsinTaskService) {
|
||||
this.similarAsinTaskService = similarAsinTaskService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "SIMILAR_ASIN";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
return similarAsinTaskService.processResultFileJob(job);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
similarAsinTaskService.cleanupResultFileJob(job);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(TaskFileJobEntity job, String message) {
|
||||
similarAsinTaskService.handleResultFileJobFailure(job, message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsAsyncOffload() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOwnerScoped() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+18
-114
@@ -4,15 +4,9 @@ import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService;
|
||||
import com.nanri.aiimage.config.InstanceMetadata;
|
||||
import com.nanri.aiimage.modules.brand.service.BrandTaskService;
|
||||
import com.nanri.aiimage.modules.collectdata.service.CollectDataService;
|
||||
import com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService;
|
||||
import com.nanri.aiimage.modules.patroldelete.service.PatrolDeleteTaskService;
|
||||
import com.nanri.aiimage.modules.pricetrack.service.PriceTrackTaskService;
|
||||
import com.nanri.aiimage.modules.productrisk.service.ProductRiskTaskService;
|
||||
import com.nanri.aiimage.modules.publish.service.PublishTaskService;
|
||||
import com.nanri.aiimage.modules.queryasin.service.QueryAsinTaskService;
|
||||
import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlTaskService;
|
||||
import com.nanri.aiimage.modules.shopmatch.service.ShopMatchTaskService;
|
||||
import com.nanri.aiimage.modules.similarasin.service.SimilarAsinTaskService;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
|
||||
@@ -41,26 +35,15 @@ public class TaskResultFileJobWorker {
|
||||
|
||||
private final TaskFileJobService taskFileJobService;
|
||||
private final TaskDistributedLockService taskDistributedLockService;
|
||||
private final TaskResultPayloadService taskResultPayloadService;
|
||||
private final FileResultMapper fileResultMapper;
|
||||
private final TaskFileJobLocalDispatcher taskFileJobLocalDispatcher;
|
||||
private final InstanceMetadata instanceMetadata;
|
||||
private final ShopMatchTaskService shopMatchTaskService;
|
||||
private final PriceTrackTaskService priceTrackTaskService;
|
||||
private final ProductRiskTaskService productRiskTaskService;
|
||||
private final PublishTaskService publishTaskService;
|
||||
private final QueryAsinTaskService queryAsinTaskService;
|
||||
private final ShopDataCrawlTaskService shopDataCrawlTaskService;
|
||||
private final WithdrawTaskService withdrawTaskService;
|
||||
private final PatrolDeleteTaskService patrolDeleteTaskService;
|
||||
private final AppearancePatentTaskService appearancePatentTaskService;
|
||||
private final SimilarAsinTaskService similarAsinTaskService;
|
||||
private final DeleteBrandRunService deleteBrandRunService;
|
||||
private final BrandTaskService brandTaskService;
|
||||
private final CollectDataService collectDataService;
|
||||
private final ResultFileJobHandlerRegistry handlerRegistry;
|
||||
@Autowired
|
||||
@Qualifier("cozeTaskExecutor")
|
||||
private TaskExecutor cozeTaskExecutor;
|
||||
@Qualifier("taskQueueExecutor")
|
||||
private TaskExecutor taskQueueExecutor;
|
||||
|
||||
@Value("${aiimage.result-file-job.local-worker-enabled:true}")
|
||||
private boolean localWorkerEnabled;
|
||||
@@ -133,12 +116,13 @@ public class TaskResultFileJobWorker {
|
||||
if (claim == null) {
|
||||
return;
|
||||
}
|
||||
if ("APPEARANCE_PATENT".equals(job.getModuleType()) || "SIMILAR_ASIN".equals(job.getModuleType())) {
|
||||
ResultFileJobHandler handler = handlerRegistry.asMap().get(job.getModuleType());
|
||||
if (handler != null && handler.supportsAsyncOffload()) {
|
||||
try {
|
||||
cozeTaskExecutor.execute(() -> processClaimedWithHeartbeat(job, claim));
|
||||
taskQueueExecutor.execute(() -> processClaimedWithHeartbeat(job, claim));
|
||||
return;
|
||||
} catch (RuntimeException ex) {
|
||||
log.warn("[task-file-job] coze module offload failed, fallback inline jobId={} taskId={} moduleType={} msg={}",
|
||||
log.warn("[task-file-job] llm module offload failed, fallback inline jobId={} taskId={} moduleType={} msg={}",
|
||||
job.getId(), job.getTaskId(), job.getModuleType(), ex.getMessage(), ex);
|
||||
}
|
||||
}
|
||||
@@ -200,12 +184,12 @@ public class TaskResultFileJobWorker {
|
||||
if (!completed) {
|
||||
if (isOwnerScopedJob(job)) {
|
||||
taskFileJobService.touchRunning(job.getId());
|
||||
log.info("[task-file-job] process waiting for async coze result jobId={} taskId={} moduleType={} resultId={} elapsedMs={}",
|
||||
log.info("[task-file-job] process waiting for async llm result jobId={} taskId={} moduleType={} resultId={} elapsedMs={}",
|
||||
job.getId(), job.getTaskId(), job.getModuleType(), job.getResultId(),
|
||||
System.currentTimeMillis() - startedAt);
|
||||
return;
|
||||
}
|
||||
taskFileJobService.deferRunning(job.getId(), "Waiting for Coze/file assembly to continue");
|
||||
taskFileJobService.deferRunning(job.getId(), "Waiting for LLM/file assembly to continue");
|
||||
log.info("[task-file-job] process deferred jobId={} taskId={} moduleType={} resultId={} elapsedMs={}",
|
||||
job.getId(), job.getTaskId(), job.getModuleType(), job.getResultId(),
|
||||
System.currentTimeMillis() - startedAt);
|
||||
@@ -262,10 +246,9 @@ public class TaskResultFileJobWorker {
|
||||
}
|
||||
|
||||
private void notifyRetryExhausted(TaskFileJobEntity job, String message) {
|
||||
if ("SHOP_DATA_CRAWL".equals(job.getModuleType())) {
|
||||
shopDataCrawlTaskService.handleResultFileJobFailure(job, message);
|
||||
} else if ("SIMILAR_ASIN".equals(job.getModuleType())) {
|
||||
similarAsinTaskService.handleResultFileJobFailure(job, message);
|
||||
ResultFileJobHandler handler = handlerRegistry.asMap().get(job.getModuleType());
|
||||
if (handler != null) {
|
||||
handler.onFailure(job, message);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -302,10 +285,8 @@ public class TaskResultFileJobWorker {
|
||||
if (job == null || job.getModuleType() == null) {
|
||||
return false;
|
||||
}
|
||||
return "APPEARANCE_PATENT".equals(job.getModuleType())
|
||||
|| "SIMILAR_ASIN".equals(job.getModuleType())
|
||||
|| "PUBLISH".equals(job.getModuleType())
|
||||
|| "SHOP_DATA_CRAWL".equals(job.getModuleType());
|
||||
ResultFileJobHandler handler = handlerRegistry.asMap().get(job.getModuleType());
|
||||
return handler != null && handler.isOwnerScoped();
|
||||
}
|
||||
|
||||
private boolean isOwnedByCurrentInstance(TaskFileJobEntity job) {
|
||||
@@ -333,90 +314,13 @@ public class TaskResultFileJobWorker {
|
||||
|
||||
private boolean dispatch(TaskFileJobEntity job) {
|
||||
String moduleType = job.getModuleType();
|
||||
if ("SHOP_MATCH".equals(moduleType)) {
|
||||
shopMatchTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if ("PRICE_TRACK".equals(moduleType)) {
|
||||
priceTrackTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if ("PRODUCT_RISK_RESOLVE".equals(moduleType)) {
|
||||
productRiskTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if (PublishTaskService.MODULE_TYPE.equals(moduleType)) {
|
||||
publishTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if ("QUERY_ASIN".equals(moduleType)) {
|
||||
queryAsinTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if ("SHOP_DATA_CRAWL".equals(moduleType)) {
|
||||
shopDataCrawlTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if ("WITHDRAW".equals(moduleType)) {
|
||||
withdrawTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if ("PATROL_DELETE".equals(moduleType)) {
|
||||
patrolDeleteTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if ("APPEARANCE_PATENT".equals(moduleType)) {
|
||||
return appearancePatentTaskService.processResultFileJob(job);
|
||||
}
|
||||
if ("SIMILAR_ASIN".equals(moduleType)) {
|
||||
return similarAsinTaskService.processResultFileJob(job);
|
||||
}
|
||||
if ("DELETE_BRAND".equals(moduleType)) {
|
||||
deleteBrandRunService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if ("BRAND".equals(moduleType)) {
|
||||
brandTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if ("COLLECT_DATA".equals(moduleType)) {
|
||||
collectDataService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
throw new IllegalArgumentException("unsupported result file job module: " + moduleType);
|
||||
return handlerRegistry.resolve(moduleType).process(job);
|
||||
}
|
||||
|
||||
private void cleanupAfterSuccess(TaskFileJobEntity job) {
|
||||
String moduleType = job.getModuleType();
|
||||
if ("SHOP_DATA_CRAWL".equals(moduleType)) {
|
||||
taskResultPayloadService.deleteLatest(job.getTaskId(), moduleType, job.getScopeKey());
|
||||
shopDataCrawlTaskService.cleanupResultFileJob(job);
|
||||
return;
|
||||
}
|
||||
if ("SHOP_MATCH".equals(moduleType)
|
||||
|| "PRICE_TRACK".equals(moduleType)
|
||||
|| "PRODUCT_RISK_RESOLVE".equals(moduleType)
|
||||
|| "QUERY_ASIN".equals(moduleType)
|
||||
|| "WITHDRAW".equals(moduleType)
|
||||
|| "PATROL_DELETE".equals(moduleType)) {
|
||||
taskResultPayloadService.deleteLatest(job.getTaskId(), moduleType, job.getScopeKey());
|
||||
return;
|
||||
}
|
||||
if ("APPEARANCE_PATENT".equals(moduleType)) {
|
||||
appearancePatentTaskService.cleanupResultFileJob(job);
|
||||
return;
|
||||
}
|
||||
if ("SIMILAR_ASIN".equals(moduleType)) {
|
||||
similarAsinTaskService.cleanupResultFileJob(job);
|
||||
return;
|
||||
}
|
||||
if ("PUBLISH".equals(moduleType)) {
|
||||
publishTaskService.cleanupResultFileJob(job);
|
||||
return;
|
||||
}
|
||||
if ("DELETE_BRAND".equals(moduleType)) {
|
||||
deleteBrandRunService.cleanupResultFileJob(job);
|
||||
return;
|
||||
ResultFileJobHandler handler = handlerRegistry.asMap().get(job.getModuleType());
|
||||
if (handler != null) {
|
||||
handler.cleanup(job);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
import com.nanri.aiimage.modules.withdraw.service.WithdrawTaskService;
|
||||
|
||||
/**
|
||||
* WITHDRAW 结果文件 Job Handler(04 注册表)。
|
||||
* onSuccess 在 markSuccess 之后调用 tryFinalizeTask(原 finalizeWithdraw 标志语义,时机严格保持);
|
||||
* cleanup 走 payload.deleteLatest。
|
||||
*/
|
||||
public class WithdrawResultFileJobHandler implements ResultFileJobHandler {
|
||||
|
||||
private final WithdrawTaskService withdrawTaskService;
|
||||
private final TaskResultPayloadService taskResultPayloadService;
|
||||
|
||||
public WithdrawResultFileJobHandler(WithdrawTaskService withdrawTaskService,
|
||||
TaskResultPayloadService taskResultPayloadService) {
|
||||
this.withdrawTaskService = withdrawTaskService;
|
||||
this.taskResultPayloadService = taskResultPayloadService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String moduleType() {
|
||||
return "WITHDRAW";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean process(TaskFileJobEntity job) {
|
||||
withdrawTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSuccess(TaskFileJobEntity job) {
|
||||
if (job == null) {
|
||||
return;
|
||||
}
|
||||
withdrawTaskService.tryFinalizeTask(job.getTaskId(), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanup(TaskFileJobEntity job) {
|
||||
taskResultPayloadService.deleteLatest(job.getTaskId(), job.getModuleType(), job.getScopeKey());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user