feat(collect-channel): 采集执行方按单判定并随 /parse 落库
「这一单交本机还是线上」原先是全局 yml aiimage.collect-routing.local-enabled, 一台服务器一个值,把同机所有账号捆成同一个执行方:本机开着的用户被迫走线上, 跑 Linux 兜底的用户也没法把某一单留在本机。现改为建单时逐单登记 biz_file_task.collect_channel(V183,可空=按模块默认),全局开关只留兜底窗口。 - 列可空且不回填:空值按模块默认解释,APPEARANCE_PATENT/SIMILAR_ASIN 读作 LOCAL、 其余读作 ONLINE,与撤掉的 AIIMAGE_COLLECT_LOCAL_* 出厂值逐字节等价, 历史单与未升级前端行为不变。 - TaskRetryCloneSupport.buildChild 必须继承通道:原单选了线上,重试掉回模块默认 等于悄悄换执行方。 - CollectChannel 用逐值比对而非 valueOf+catch 判「不可识别」:后者会把静默 catch 总数顶过 CatchSilenceRatchetTest 上限 1057。 - 两支建单快照 golden 随 collect_channel 键重建(只多出 collectChannel=null)。
This commit is contained in:
@@ -3,21 +3,17 @@ package com.nanri.aiimage.config;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 采集执行方路由:哪些模块优先交给本地客户端、多久没人领才由 Linux 兜底。
|
* 采集执行路由的**兜底窗口**配置(2026-10-31 起只剩这一件事)。
|
||||||
*
|
*
|
||||||
* <p>2026-10-29 产品口径:外观专利(APPEARANCE_PATENT)与相似ASIN(SIMILAR_ASIN)默认
|
* <p>「这一单交给本机客户端还是交给 Linux/外机 Windows」已经下沉为任务级字段
|
||||||
* 「本地采集」。本地优先不等于只认本地——页面推了没人领时,PENDING 超过
|
* {@code biz_file_task.collect_channel}(V183,界面单选框,默认本机),不再由本类的全局
|
||||||
* {@code linux-fallback-minutes} 就交 Linux 后台认领,否则本地机器全关时任务会无限排队
|
* 开关决定;原先的 {@code local-enabled} 一台服务器一个值,把同机上所有账号捆成同一个
|
||||||
* (PENDING 已不再按时间判死)。
|
* 执行方,本地机器开着的用户被迫走线上,反之亦然。
|
||||||
*
|
*
|
||||||
* <p><b>未登记在 {@code local-enabled} 里的模块一律按「非本地」处理</b>,保持它们原有的
|
* <p>本类保留的窗口管的是另一件事:通道选了 LOCAL、但那台机器当天没开,任务会一直停在
|
||||||
* 内部认领等待窗口({@code internal-min-pending-minutes})。默认值刻意不是 true:
|
* PENDING(PENDING 已不再按时间判死)。超过 {@code linux-fallback-minutes} 还没被本地领走,
|
||||||
* 开关只对点名的模块生效,新模块不会被悄悄卷进本地优先。
|
* 就允许 Linux 接管,避免无限排队。
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@ConfigurationProperties(prefix = "aiimage.collect-routing")
|
@ConfigurationProperties(prefix = "aiimage.collect-routing")
|
||||||
@@ -29,19 +25,9 @@ public class CollectRoutingProperties {
|
|||||||
/** 相似ASIN(货源查询)模块名。 */
|
/** 相似ASIN(货源查询)模块名。 */
|
||||||
public static final String MODULE_SIMILAR_ASIN = "SIMILAR_ASIN";
|
public static final String MODULE_SIMILAR_ASIN = "SIMILAR_ASIN";
|
||||||
|
|
||||||
/** 模块 → 是否本地采集;键为大写模块名。 */
|
/** LOCAL 通道的任务在 PENDING 超过多少分钟后允许 Linux 兜底认领。 */
|
||||||
private Map<String, Boolean> localEnabled = new LinkedHashMap<>();
|
|
||||||
|
|
||||||
/** 本地采集模块在 PENDING 超过多少分钟后允许 Linux 兜底认领。 */
|
|
||||||
private long linuxFallbackMinutes = 30L;
|
private long linuxFallbackMinutes = 30L;
|
||||||
|
|
||||||
public boolean isLocal(String moduleType) {
|
|
||||||
if (moduleType == null || moduleType.isBlank()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return Boolean.TRUE.equals(localEnabled.get(moduleType.trim().toUpperCase(Locale.ROOT)));
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 兜底窗口下限 1 分钟:配 0/负数等于关掉本地优先,不允许静默变成「Linux 立刻抢」。 */
|
/** 兜底窗口下限 1 分钟:配 0/负数等于关掉本地优先,不允许静默变成「Linux 立刻抢」。 */
|
||||||
public long safeLinuxFallbackMinutes() {
|
public long safeLinuxFallbackMinutes() {
|
||||||
return Math.max(1L, linuxFallbackMinutes);
|
return Math.max(1L, linuxFallbackMinutes);
|
||||||
|
|||||||
+7
@@ -30,4 +30,11 @@ public class AppearancePatentParseRequest {
|
|||||||
@JsonAlias({"apiKey"})
|
@JsonAlias({"apiKey"})
|
||||||
@Schema(description = "调用 LLM API 的任务级密钥。非必填;为空时后端按用户密钥配置兜底。")
|
@Schema(description = "调用 LLM API 的任务级密钥。非必填;为空时后端按用户密钥配置兜底。")
|
||||||
private String apiKey;
|
private String apiKey;
|
||||||
|
|
||||||
|
@JsonProperty("collect_channel")
|
||||||
|
@JsonAlias({"collectChannel"})
|
||||||
|
@Schema(description = "这一单的采集执行通道:LOCAL=本机客户端采,ONLINE=Linux 或外机 Windows。"
|
||||||
|
+ "非必填;留空或不可识别的值按模块默认执行(外观专利默认 LOCAL),与未升级前端的行为一致。",
|
||||||
|
example = "LOCAL", allowableValues = {"LOCAL", "ONLINE"})
|
||||||
|
private String collectChannel;
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-4
@@ -212,10 +212,12 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
|
|||||||
throw new com.nanri.aiimage.common.exception.BusinessException(com.nanri.aiimage.modules
|
throw new com.nanri.aiimage.common.exception.BusinessException(com.nanri.aiimage.modules
|
||||||
.usersecret.service.UserTaskGuardService.PAUSED_MESSAGE);
|
.usersecret.service.UserTaskGuardService.PAUSED_MESSAGE);
|
||||||
}
|
}
|
||||||
// 2026-10-29 本地采集开关:开着就恢复「页面推本地客户端」的启动语义;
|
// 执行方由这一单的通道决定(V183 collect_channel,建单时界面单选,默认本机):
|
||||||
// 关着走原后台语义(记录支持里对 PENDING 明确报「已切换后台自动执行」)。
|
// LOCAL 恢复「页面推本地客户端」的启动语义;ONLINE 走原后台语义(记录支持里对 PENDING
|
||||||
if (collectRoutingProperties != null
|
// 明确报「已切换后台自动执行」),任务留在 PENDING 等 Linux/外机认领。
|
||||||
&& collectRoutingProperties.isLocal(com.nanri.aiimage.config.CollectRoutingProperties.MODULE_APPEARANCE_PATENT)) {
|
FileTaskEntity channelTask = requireSubmissionTask(taskId);
|
||||||
|
if (com.nanri.aiimage.modules.task.model.CollectChannel
|
||||||
|
.resolve(channelTask.getCollectChannel(), channelTask.getModuleType()).isLocal()) {
|
||||||
activateForLocalClient(taskId, userId);
|
activateForLocalClient(taskId, userId);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
+3
@@ -194,6 +194,9 @@ public final class AppearancePatentParsePipeline {
|
|||||||
|
|
||||||
FileTaskEntity task = headerFactory.create(TaskStatuses.FileTask.PENDING, "PYTHON_QUEUE", request.getUserId(), deviceId,
|
FileTaskEntity task = headerFactory.create(TaskStatuses.FileTask.PENDING, "PYTHON_QUEUE", request.getUserId(), deviceId,
|
||||||
sourceFiles.size());
|
sourceFiles.size());
|
||||||
|
// 执行方在这一单选(界面 LOCAL/ONLINE 单选框,V183);未登记=按模块默认,历史行为不变。
|
||||||
|
task.setCollectChannel(com.nanri.aiimage.modules.task.model.CollectChannel
|
||||||
|
.persistedValue(request.getCollectChannel()));
|
||||||
task.setSuccessFileCount(0);
|
task.setSuccessFileCount(0);
|
||||||
task.setFailedFileCount(0);
|
task.setFailedFileCount(0);
|
||||||
task.setRequestJson(jsonWriter.write(request, "序列化解析结果失败"));
|
task.setRequestJson(jsonWriter.write(request, "序列化解析结果失败"));
|
||||||
|
|||||||
+7
@@ -40,4 +40,11 @@ public class SimilarAsinParseRequest {
|
|||||||
@JsonAlias({"categorySwitch"})
|
@JsonAlias({"categorySwitch"})
|
||||||
@Schema(description = "传递给 LLM 的 category_switch 类目检测开关,true 为开启,false 为关闭。")
|
@Schema(description = "传递给 LLM 的 category_switch 类目检测开关,true 为开启,false 为关闭。")
|
||||||
private Boolean categorySwitch = Boolean.FALSE;
|
private Boolean categorySwitch = Boolean.FALSE;
|
||||||
|
|
||||||
|
@JsonProperty("collect_channel")
|
||||||
|
@JsonAlias({"collectChannel"})
|
||||||
|
@Schema(description = "这一单的采集执行通道:LOCAL=本机客户端采,ONLINE=Linux 或外机 Windows。"
|
||||||
|
+ "非必填;留空或不可识别的值按模块默认执行(相似ASIN 默认 LOCAL),与未升级前端的行为一致。",
|
||||||
|
example = "LOCAL", allowableValues = {"LOCAL", "ONLINE"})
|
||||||
|
private String collectChannel;
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-4
@@ -450,6 +450,9 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
|||||||
task.setTaskNo(MODULE_TYPE + "-" + IdUtil.getSnowflakeNextIdStr());
|
task.setTaskNo(MODULE_TYPE + "-" + IdUtil.getSnowflakeNextIdStr());
|
||||||
task.setModuleType(MODULE_TYPE);
|
task.setModuleType(MODULE_TYPE);
|
||||||
task.setTaskMode("PYTHON_QUEUE");
|
task.setTaskMode("PYTHON_QUEUE");
|
||||||
|
// 执行方在这一单选(界面 LOCAL/ONLINE 单选框,V183);未登记=按模块默认,历史行为不变。
|
||||||
|
task.setCollectChannel(com.nanri.aiimage.modules.task.model.CollectChannel
|
||||||
|
.persistedValue(request.getCollectChannel()));
|
||||||
task.setStatus(STATUS_PENDING);
|
task.setStatus(STATUS_PENDING);
|
||||||
task.setSourceFileCount(sourceFiles.size());
|
task.setSourceFileCount(sourceFiles.size());
|
||||||
task.setSuccessFileCount(0);
|
task.setSuccessFileCount(0);
|
||||||
@@ -547,11 +550,12 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
|||||||
throw new BusinessException("任务不存在");
|
throw new BusinessException("任务不存在");
|
||||||
}
|
}
|
||||||
ownershipSupport().ensureTaskOwnedByCurrentInstance(task, "activate");
|
ownershipSupport().ensureTaskOwnedByCurrentInstance(task, "activate");
|
||||||
// 2026-10-29 本地采集开关:关闭时页面不再推本机客户端,任务留 PENDING 等 Linux 后台认领。
|
// 执行方由这一单的通道决定(V183 collect_channel,建单时界面单选,默认本机):
|
||||||
|
// 选了线上的单子页面不再推本机客户端,任务留 PENDING 等 Linux/外机认领;
|
||||||
// 这里把「点启动」明确拒掉,避免旧页面缓存继续推队列造成与后台双跑。
|
// 这里把「点启动」明确拒掉,避免旧页面缓存继续推队列造成与后台双跑。
|
||||||
if (collectRoutingProperties != null
|
if (!com.nanri.aiimage.modules.task.model.CollectChannel
|
||||||
&& !collectRoutingProperties.isLocal(com.nanri.aiimage.config.CollectRoutingProperties.MODULE_SIMILAR_ASIN)) {
|
.resolve(task.getCollectChannel(), task.getModuleType()).isLocal()) {
|
||||||
throw new BusinessException("相似ASIN已切换后台自动执行,无需打开客户端,提交后稍候自动开始");
|
throw new BusinessException("本单已选择线上采集,无需打开客户端,提交后稍候自动开始");
|
||||||
}
|
}
|
||||||
// 只允许 PENDING→RUNNING(条件更新):与客户端「兜底拉取」的原子认领互斥,
|
// 只允许 PENDING→RUNNING(条件更新):与客户端「兜底拉取」的原子认领互斥,
|
||||||
// 谁先翻转谁执行,避免页面与客户端重复执行同一任务
|
// 谁先翻转谁执行,避免页面与客户端重复执行同一任务
|
||||||
|
|||||||
+11
-8
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.task.controller;
|
|||||||
|
|
||||||
import com.nanri.aiimage.common.api.ApiResponse;
|
import com.nanri.aiimage.common.api.ApiResponse;
|
||||||
import com.nanri.aiimage.config.CollectRoutingProperties;
|
import com.nanri.aiimage.config.CollectRoutingProperties;
|
||||||
|
import com.nanri.aiimage.modules.task.model.CollectChannel;
|
||||||
import com.nanri.aiimage.modules.task.model.vo.CollectRoutingVo;
|
import com.nanri.aiimage.modules.task.model.vo.CollectRoutingVo;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
@@ -11,25 +12,27 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 专利/货源的本地采集开关查询。
|
* 采集通道的<b>模块默认值</b>查询(V183 起不再决定执行方)。
|
||||||
*
|
*
|
||||||
* <p>前端据此决定「启动」按钮走哪条链路:本地采集开着就取出队列载荷推本机客户端,
|
* <p>2026-10-31 起「这一单交给本机还是线上」是建单时界面单选、写进
|
||||||
* 关着就只建单、等 Linux 后台认领。开关的唯一真源在服务端配置
|
* {@code biz_file_task.collect_channel} 的任务级字段;本端点只回答「这一单没登记通道时
|
||||||
* ({@code aiimage.collect-routing.local-enabled}),前端不自己保存副本。
|
* 按哪一侧兜」,前端拿它做单选框的默认选中项,不自己保存副本。历史任务与未升级前端
|
||||||
|
* 因此仍按这里说的默认走。
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@RequestMapping("/api/collect-routing")
|
@RequestMapping("/api/collect-routing")
|
||||||
@Tag(name = "采集路由", description = "专利/货源的本地采集开关(前端读取后决定推送本地还是提交后台)")
|
@Tag(name = "采集路由", description = "各模块未登记通道时的默认执行方(前端读取后作为单选框默认选中项)")
|
||||||
public class CollectRoutingController {
|
public class CollectRoutingController {
|
||||||
|
|
||||||
private final CollectRoutingProperties properties;
|
private final CollectRoutingProperties properties;
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Operation(summary = "查询本地采集开关", description = "返回外观专利与相似ASIN当前是否走本地采集。只读,无副作用。")
|
@Operation(summary = "查询新建任务的默认采集通道",
|
||||||
|
description = "返回外观专利与相似ASIN在「这一单没登记通道」时按哪一侧执行。只读,无副作用。")
|
||||||
public ApiResponse<CollectRoutingVo> routing() {
|
public ApiResponse<CollectRoutingVo> routing() {
|
||||||
return ApiResponse.success(new CollectRoutingVo(
|
return ApiResponse.success(new CollectRoutingVo(
|
||||||
properties.isLocal(CollectRoutingProperties.MODULE_APPEARANCE_PATENT),
|
CollectChannel.defaultFor(CollectRoutingProperties.MODULE_APPEARANCE_PATENT).isLocal(),
|
||||||
properties.isLocal(CollectRoutingProperties.MODULE_SIMILAR_ASIN)));
|
CollectChannel.defaultFor(CollectRoutingProperties.MODULE_SIMILAR_ASIN).isLocal()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,79 @@
|
|||||||
|
package com.nanri.aiimage.modules.task.model;
|
||||||
|
|
||||||
|
import com.nanri.aiimage.config.CollectRoutingProperties;
|
||||||
|
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 任务级采集执行通道:这一单交给用户自己的机器采,还是交给 Linux/外机 Windows 采。
|
||||||
|
*
|
||||||
|
* <p>建单时由界面单选框写入 {@code biz_file_task.collect_channel}(V183),默认本机。
|
||||||
|
* 它取代了原先唯一的全局 {@code aiimage.collect-routing.local-enabled} 一档——那一档现在
|
||||||
|
* 只剩兜底窗口,不再决定执行方。
|
||||||
|
*
|
||||||
|
* <p>列可空,且**不回填**:空值按模块默认解释,外观专利/相似ASIN 读作 {@link #LOCAL}、
|
||||||
|
* 其余模块读作 {@link #ONLINE},与 V183 之前 {@code AIIMAGE_COLLECT_LOCAL_*} 的出厂值
|
||||||
|
* {@code true} 逐字等价。未升级的客户端与全部历史任务因此行为不变。
|
||||||
|
*/
|
||||||
|
public enum CollectChannel {
|
||||||
|
|
||||||
|
/** 本机客户端采集(默认)。 */
|
||||||
|
LOCAL,
|
||||||
|
|
||||||
|
/** 线上采集:Linux 后台 worker 或外机 Windows。 */
|
||||||
|
ONLINE;
|
||||||
|
|
||||||
|
/** 该模块在没有显式登记通道时的默认执行方。 */
|
||||||
|
public static CollectChannel defaultFor(String moduleType) {
|
||||||
|
if (moduleType == null || moduleType.isBlank()) {
|
||||||
|
return ONLINE;
|
||||||
|
}
|
||||||
|
String key = moduleType.trim().toUpperCase(Locale.ROOT);
|
||||||
|
if (CollectRoutingProperties.MODULE_APPEARANCE_PATENT.equals(key)
|
||||||
|
|| CollectRoutingProperties.MODULE_SIMILAR_ASIN.equals(key)) {
|
||||||
|
return LOCAL;
|
||||||
|
}
|
||||||
|
return ONLINE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 解析库里存的通道值;空或不可识别时回落到该模块的默认(不让一个脏值把单子永久饿死)。 */
|
||||||
|
public static CollectChannel resolve(String stored, String moduleType) {
|
||||||
|
CollectChannel registered = parseOrNull(stored);
|
||||||
|
return registered == null ? defaultFor(moduleType) : registered;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 归一化外部(界面/接口)传入的通道值;不可识别返回 null,由调用方按「不登记」处理。 */
|
||||||
|
public static CollectChannel ofNullable(String raw) {
|
||||||
|
return parseOrNull(raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 按名字取通道;空或不可识别返回 {@code null},由调用方决定兜法(不登记/回落默认)。 */
|
||||||
|
private static CollectChannel parseOrNull(String raw) {
|
||||||
|
if (raw == null || raw.isBlank()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
// 逐值比对而不是 valueOf+catch:拿异常当控制流会往静默 catch 棘轮上叠账,
|
||||||
|
// 而这里要的「不可识别」本来就是一个正常的空结果。
|
||||||
|
String key = raw.trim().toUpperCase(Locale.ROOT);
|
||||||
|
for (CollectChannel channel : values()) {
|
||||||
|
if (channel.name().equals(key)) {
|
||||||
|
return channel;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 建单时写库用的归一值:可识别返回大写枚举名,空或不可识别返回 {@code null}=「不登记通道」,
|
||||||
|
* 由 {@link #defaultFor(String)} 按模块兜。调用方不需要再判空——一个脏值不该让单子饿死,
|
||||||
|
* 也不该让界面的一次误传把执行方永久定死。
|
||||||
|
*/
|
||||||
|
public static String persistedValue(String raw) {
|
||||||
|
CollectChannel channel = parseOrNull(raw);
|
||||||
|
return channel == null ? null : channel.name();
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isLocal() {
|
||||||
|
return this == LOCAL;
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
@@ -16,6 +16,8 @@ public class FileTaskEntity {
|
|||||||
private String taskNo;
|
private String taskNo;
|
||||||
private String moduleType;
|
private String moduleType;
|
||||||
private String taskMode;
|
private String taskMode;
|
||||||
|
/** 采集执行通道 LOCAL/ONLINE(V183);空=按模块默认,见 {@code CollectChannel}。 */
|
||||||
|
private String collectChannel;
|
||||||
private String status;
|
private String status;
|
||||||
private Integer sourceFileCount;
|
private Integer sourceFileCount;
|
||||||
private Integer successFileCount;
|
private Integer successFileCount;
|
||||||
|
|||||||
+32
-26
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|||||||
import com.nanri.aiimage.config.CollectRoutingProperties;
|
import com.nanri.aiimage.config.CollectRoutingProperties;
|
||||||
import com.nanri.aiimage.config.InstanceMetadata;
|
import com.nanri.aiimage.config.InstanceMetadata;
|
||||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||||
|
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.FileTaskEntity;
|
||||||
import com.nanri.aiimage.modules.task.model.vo.TaskClientPullVo;
|
import com.nanri.aiimage.modules.task.model.vo.TaskClientPullVo;
|
||||||
import com.nanri.aiimage.modules.task.spi.ClientTaskPullSpi;
|
import com.nanri.aiimage.modules.task.spi.ClientTaskPullSpi;
|
||||||
@@ -30,9 +31,10 @@ import java.util.Map;
|
|||||||
* 只挑创建超过 N 分钟仍是 PENDING 的本用户任务,逐条用条件更新认领(PENDING→RUNNING),
|
* 只挑创建超过 N 分钟仍是 PENDING 的本用户任务,逐条用条件更新认领(PENDING→RUNNING),
|
||||||
* 只有把状态翻过来的调用方算领取成功 —— 与页面 activate 天然互斥,不会重复执行。
|
* 只有把状态翻过来的调用方算领取成功 —— 与页面 activate 天然互斥,不会重复执行。
|
||||||
*
|
*
|
||||||
* <p>2026-10-29 起按 {@link CollectRoutingProperties} 分两档路由:本地采集模块只允许客户端领;
|
* <p>2026-10-31 起执行方由<b>这一单自己</b>决定({@code biz_file_task.collect_channel},V183):
|
||||||
* Linux 内部认领对本地模块要等 {@code linux-fallback-minutes} 的兜底窗口,对非本地模块保持
|
* LOCAL 的单只允许在线客户端领,Linux 内部认领要等满 {@code linux-fallback-minutes} 的兜底窗口;
|
||||||
* 原有的 {@code internal-min-pending-minutes}。详见 {@link #pullPendingTasksInternal(List)}。
|
* ONLINE 的单(含未登记通道的非本地模块)保持原有的 {@code internal-min-pending-minutes}。
|
||||||
|
* 详见 {@link #pullPendingTasksInternal(List)}。
|
||||||
*
|
*
|
||||||
* <p>开关 {@code aiimage.client-task-pull.enabled} 默认关闭;模块白名单默认只放"执行参数全在服务端"
|
* <p>开关 {@code aiimage.client-task-pull.enabled} 默认关闭;模块白名单默认只放"执行参数全在服务端"
|
||||||
* 的模块,其余模块实现 {@link ClientTaskPullSpi} 后可逐步加入。
|
* 的模块,其余模块实现 {@link ClientTaskPullSpi} 后可逐步加入。
|
||||||
@@ -118,10 +120,10 @@ public class TaskClientPullService {
|
|||||||
*/
|
*/
|
||||||
@PostConstruct
|
@PostConstruct
|
||||||
public void logEffectiveConfig() {
|
public void logEffectiveConfig() {
|
||||||
log.info("[client-task-pull] 生效配置 enabled={} internalEnabled={} internalMinPendingMinutes={} moduleTypes={} minPendingMinutes={} limit={} handlers={} localEnabled={} linuxFallbackMinutes={}",
|
log.info("[client-task-pull] 生效配置 enabled={} internalEnabled={} internalMinPendingMinutes={} moduleTypes={} minPendingMinutes={} limit={} handlers={} linuxFallbackMinutes={}",
|
||||||
enabled, internalEnabled, internalMinPendingMinutes, moduleTypes, minPendingMinutes,
|
enabled, internalEnabled, internalMinPendingMinutes, moduleTypes, minPendingMinutes,
|
||||||
Math.max(1, Math.min(limit, MAX_LIMIT)), pullHandlers.keySet(),
|
Math.max(1, Math.min(limit, MAX_LIMIT)), pullHandlers.keySet(),
|
||||||
collectRoutingProperties.getLocalEnabled(), collectRoutingProperties.safeLinuxFallbackMinutes());
|
collectRoutingProperties.safeLinuxFallbackMinutes());
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 拉取并认领该用户"长期未被领取"的任务,按创建时间升序返回,最多 limit 条。 */
|
/** 拉取并认领该用户"长期未被领取"的任务,按创建时间升序返回,最多 limit 条。 */
|
||||||
@@ -137,24 +139,26 @@ public class TaskClientPullService {
|
|||||||
log.warn("[client-task-pull] 模块白名单为空,本次不拉取 userId={}", userId);
|
log.warn("[client-task-pull] 模块白名单为空,本次不拉取 userId={}", userId);
|
||||||
return List.of();
|
return List.of();
|
||||||
}
|
}
|
||||||
// 只拉本地采集模块:关掉本地开关的模块只认 Linux 后台,客户端拿到会算抢跑
|
// 通道由这一单自己说(V183 collect_channel):选了线上的单子客户端不能领,领了就是抢跑。
|
||||||
types = types.stream().filter(collectRoutingProperties::isLocal).toList();
|
|
||||||
if (types.isEmpty()) {
|
|
||||||
log.info("[client-task-pull] 白名单模块均已切换 Linux 后台执行,客户端不拉取 userId={} moduleTypes={}",
|
|
||||||
userId, moduleTypes);
|
|
||||||
return List.of();
|
|
||||||
}
|
|
||||||
long startedAt = System.currentTimeMillis();
|
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, minPendingMinutes));
|
||||||
int safeLimit = Math.max(1, Math.min(limit, MAX_LIMIT));
|
int safeLimit = Math.max(1, Math.min(limit, MAX_LIMIT));
|
||||||
List<FileTaskEntity> candidates = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
|
List<FileTaskEntity> candidates = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
|
||||||
.select(FileTaskEntity::getId, FileTaskEntity::getModuleType, FileTaskEntity::getCreatedAt)
|
.select(FileTaskEntity::getId, FileTaskEntity::getModuleType,
|
||||||
.eq(FileTaskEntity::getUserId, userId)
|
FileTaskEntity::getCollectChannel, FileTaskEntity::getCreatedAt)
|
||||||
.eq(FileTaskEntity::getStatus, STATUS_PENDING)
|
.eq(FileTaskEntity::getUserId, userId)
|
||||||
.in(FileTaskEntity::getModuleType, types)
|
.eq(FileTaskEntity::getStatus, STATUS_PENDING)
|
||||||
.lt(FileTaskEntity::getCreatedAt, cutoff)
|
.in(FileTaskEntity::getModuleType, types)
|
||||||
.orderByAsc(FileTaskEntity::getCreatedAt)
|
.lt(FileTaskEntity::getCreatedAt, cutoff)
|
||||||
.last("limit " + safeLimit));
|
.orderByAsc(FileTaskEntity::getCreatedAt)
|
||||||
|
.last("limit " + safeLimit))
|
||||||
|
.stream()
|
||||||
|
.filter(task -> CollectChannel.resolve(task.getCollectChannel(), task.getModuleType()).isLocal())
|
||||||
|
.toList();
|
||||||
|
if (candidates.isEmpty() && !types.isEmpty()) {
|
||||||
|
log.info("[client-task-pull] 白名单内没有本机通道的排队任务,本次不拉取 userId={} moduleTypes={}",
|
||||||
|
userId, moduleTypes);
|
||||||
|
}
|
||||||
List<TaskClientPullVo> claimed = claimCandidates(candidates, "userId=" + userId);
|
List<TaskClientPullVo> claimed = claimCandidates(candidates, "userId=" + userId);
|
||||||
log.info("[client-task-pull] 拉取完成 userId={} 候选={} 认领={} 耗时={}ms",
|
log.info("[client-task-pull] 拉取完成 userId={} 候选={} 认领={} 耗时={}ms",
|
||||||
userId, candidates.size(), claimed.size(), System.currentTimeMillis() - startedAt);
|
userId, candidates.size(), claimed.size(), System.currentTimeMillis() - startedAt);
|
||||||
@@ -168,10 +172,10 @@ public class TaskClientPullService {
|
|||||||
* 独立开关 {@code aiimage.client-task-pull.internal-enabled},与客户端开关解耦:
|
* 独立开关 {@code aiimage.client-task-pull.internal-enabled},与客户端开关解耦:
|
||||||
* 客户端侧未升级/未开启时也能单独让服务端 worker 上线。
|
* 客户端侧未升级/未开启时也能单独让服务端 worker 上线。
|
||||||
*
|
*
|
||||||
* <p><b>2026-10-29 本地优先</b>:本地采集模块({@code aiimage.collect-routing.local-enabled})
|
* <p><b>2026-10-31 按单通道</b>:这一单自己登记了 {@code collect_channel}(V183)就按它判;
|
||||||
* 的任务要让位给本地客户端——PENDING 超过 {@code linux-fallback-minutes} 还没被本地领取,
|
* LOCAL 通道的任务要让位给本地客户端——PENDING 超过 {@code linux-fallback-minutes} 还没被本地
|
||||||
* 才允许这里接管;非本地模块保持 {@code internal-min-pending-minutes} 的原窗口。
|
* 领取,才允许这里接管;ONLINE 与未登记通道的非本地模块保持 {@code internal-min-pending-minutes}
|
||||||
* 没有这层过滤,页面刚把任务推给客户端,Linux 就会在 2 分钟后抢走并双跑。
|
* 的原窗口。没有这层过滤,页面刚把任务推给客户端,Linux 就会在 2 分钟后抢走并双跑。
|
||||||
*/
|
*/
|
||||||
public List<TaskClientPullVo> pullPendingTasksInternal(List<String> moduleTypes) {
|
public List<TaskClientPullVo> pullPendingTasksInternal(List<String> moduleTypes) {
|
||||||
if (!internalEnabled) {
|
if (!internalEnabled) {
|
||||||
@@ -192,7 +196,8 @@ public class TaskClientPullService {
|
|||||||
LocalDateTime localCutoff = now.minusMinutes(localFallbackMinutes);
|
LocalDateTime localCutoff = now.minusMinutes(localFallbackMinutes);
|
||||||
int safeLimit = Math.max(1, Math.min(limit, MAX_LIMIT));
|
int safeLimit = Math.max(1, Math.min(limit, MAX_LIMIT));
|
||||||
List<FileTaskEntity> candidates = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
|
List<FileTaskEntity> candidates = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
|
||||||
.select(FileTaskEntity::getId, FileTaskEntity::getModuleType, FileTaskEntity::getCreatedAt)
|
.select(FileTaskEntity::getId, FileTaskEntity::getModuleType,
|
||||||
|
FileTaskEntity::getCollectChannel, FileTaskEntity::getCreatedAt)
|
||||||
.eq(FileTaskEntity::getStatus, STATUS_PENDING)
|
.eq(FileTaskEntity::getStatus, STATUS_PENDING)
|
||||||
.in(FileTaskEntity::getModuleType, types)
|
.in(FileTaskEntity::getModuleType, types)
|
||||||
.lt(FileTaskEntity::getCreatedAt, cutoff)
|
.lt(FileTaskEntity::getCreatedAt, cutoff)
|
||||||
@@ -200,13 +205,14 @@ public class TaskClientPullService {
|
|||||||
.last("limit " + safeLimit));
|
.last("limit " + safeLimit));
|
||||||
if (!candidates.isEmpty()) {
|
if (!candidates.isEmpty()) {
|
||||||
int before = candidates.size();
|
int before = candidates.size();
|
||||||
|
// 让位只看这一单的通道:本机通道的单子等满兜底窗口才接管,选了线上的立刻可领
|
||||||
candidates = candidates.stream()
|
candidates = candidates.stream()
|
||||||
.filter(task -> !collectRoutingProperties.isLocal(task.getModuleType())
|
.filter(task -> !CollectChannel.resolve(task.getCollectChannel(), task.getModuleType()).isLocal()
|
||||||
|| task.getCreatedAt() == null
|
|| task.getCreatedAt() == null
|
||||||
|| !task.getCreatedAt().isAfter(localCutoff))
|
|| !task.getCreatedAt().isAfter(localCutoff))
|
||||||
.toList();
|
.toList();
|
||||||
if (candidates.size() < before) {
|
if (candidates.size() < before) {
|
||||||
log.info("[client-task-pull] 内部认领让位本地:本轮跳过 {} 条本地采集模块的排队任务(兜底窗口 {} 分钟)",
|
log.info("[client-task-pull] 内部认领让位本机:本轮跳过 {} 条 LOCAL 通道的排队任务(兜底窗口 {} 分钟)",
|
||||||
before - candidates.size(), localFallbackMinutes);
|
before - candidates.size(), localFallbackMinutes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -49,6 +49,8 @@ public class TaskRetryCloneSupport {
|
|||||||
child.setTaskNo(original.getModuleType() + "-" + IdUtil.getSnowflakeNextIdStr());
|
child.setTaskNo(original.getModuleType() + "-" + IdUtil.getSnowflakeNextIdStr());
|
||||||
child.setModuleType(original.getModuleType());
|
child.setModuleType(original.getModuleType());
|
||||||
child.setTaskMode(original.getTaskMode());
|
child.setTaskMode(original.getTaskMode());
|
||||||
|
// 通道必须继承:用户在原单上选了线上,重试却掉回模块默认(本机),等于悄悄换执行方。
|
||||||
|
child.setCollectChannel(original.getCollectChannel());
|
||||||
child.setStatus(STATUS_PENDING);
|
child.setStatus(STATUS_PENDING);
|
||||||
child.setSourceFileCount(original.getSourceFileCount());
|
child.setSourceFileCount(original.getSourceFileCount());
|
||||||
child.setSuccessFileCount(0);
|
child.setSuccessFileCount(0);
|
||||||
|
|||||||
@@ -17,10 +17,8 @@ AIIMAGE_COST_GUARD_LLM_WINDOW_TOKENS_THRESHOLD=600000
|
|||||||
AIIMAGE_COST_GUARD_PLATFORM_PROXY_DAILY_THRESHOLD=2000
|
AIIMAGE_COST_GUARD_PLATFORM_PROXY_DAILY_THRESHOLD=2000
|
||||||
AIIMAGE_COST_GUARD_SHARED_ACCOUNTS_THRESHOLD=3
|
AIIMAGE_COST_GUARD_SHARED_ACCOUNTS_THRESHOLD=3
|
||||||
|
|
||||||
# 采集执行方路由:专利/货源默认本地采集;关掉则只由 Linux 后台执行。
|
# 采集执行通道:由建单时界面单选(biz_file_task.collect_channel,V183),不再有全局开关。
|
||||||
# 本地采集的任务 PENDING 超过该分钟数还没被客户端领走,才允许 Linux 兜底。
|
# 本机通道的任务 PENDING 超过该分钟数还没被客户端领走,才允许 Linux 兜底。
|
||||||
AIIMAGE_COLLECT_LOCAL_APPEARANCE_PATENT=true
|
|
||||||
AIIMAGE_COLLECT_LOCAL_SIMILAR_ASIN=true
|
|
||||||
AIIMAGE_COLLECT_LINUX_FALLBACK_MINUTES=30
|
AIIMAGE_COLLECT_LINUX_FALLBACK_MINUTES=30
|
||||||
|
|
||||||
AIIMAGE_DB_URL=jdbc:mysql://127.0.0.1:3306/aiimage?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
|
AIIMAGE_DB_URL=jdbc:mysql://127.0.0.1:3306/aiimage?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
|
||||||
|
|||||||
@@ -390,9 +390,6 @@ aiimage:
|
|||||||
# 关掉某模块=该模块只由 Linux 后台执行,页面不再推送。未登记的模块按「非本地」处理,
|
# 关掉某模块=该模块只由 Linux 后台执行,页面不再推送。未登记的模块按「非本地」处理,
|
||||||
# 保持内部认领原有的 internal-min-pending-minutes,不被卷进本地优先。
|
# 保持内部认领原有的 internal-min-pending-minutes,不被卷进本地优先。
|
||||||
collect-routing:
|
collect-routing:
|
||||||
local-enabled:
|
|
||||||
APPEARANCE_PATENT: ${AIIMAGE_COLLECT_LOCAL_APPEARANCE_PATENT:true}
|
|
||||||
SIMILAR_ASIN: ${AIIMAGE_COLLECT_LOCAL_SIMILAR_ASIN:true}
|
|
||||||
linux-fallback-minutes: ${AIIMAGE_COLLECT_LINUX_FALLBACK_MINUTES:30}
|
linux-fallback-minutes: ${AIIMAGE_COLLECT_LINUX_FALLBACK_MINUTES:30}
|
||||||
# 客户端兜底拉取:页面没推送成功(只解析没点启动 / 推送前关页面 / 纯浏览器打开)、
|
# 客户端兜底拉取:页面没推送成功(只解析没点启动 / 推送前关页面 / 纯浏览器打开)、
|
||||||
# 长期停在 PENDING 的任务由在线客户端领走执行。2026-10-29 起 PENDING 不再按 2 小时判死
|
# 长期停在 PENDING 的任务由在线客户端领走执行。2026-10-29 起 PENDING 不再按 2 小时判死
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
-- V183: 任务级采集执行通道(本地采集 / 线上采集)
|
||||||
|
--
|
||||||
|
-- 背景(2026-10-31 用户拍板):
|
||||||
|
-- 「这一单在用户自己机器上采,还是交给 Linux/外机 Windows 采」原先只有**全局** yml
|
||||||
|
-- `aiimage.collect-routing.local-enabled` 一档,一台服务器一个值,所有账号被捆在一起:
|
||||||
|
-- 本地机器开着的用户被迫走线上,Linux 兜底在跑的用户也没法把某一单留在本机。
|
||||||
|
-- 现在改成建单时由界面单选框决定,默认本机。
|
||||||
|
--
|
||||||
|
-- 设计口径:
|
||||||
|
-- * 可空:NULL=「这一单没登记通道」,由 `CollectChannel.defaultFor(moduleType)` 兜,
|
||||||
|
-- 外观专利/相似ASIN 读作 LOCAL、其余模块读作非本地——与 V183 之前出厂值
|
||||||
|
-- (`AIIMAGE_COLLECT_LOCAL_APPEARANCE_PATENT/SIMILAR_ASIN:true`)逐字等价,
|
||||||
|
-- 所以历史行与未升级客户端的行为不变,不需要回填;
|
||||||
|
-- * 不加索引:两条认领查询本来就按 (user_id|status, module_type, created_at) 收口,
|
||||||
|
-- 通道是在已筛出的候选上判定的(量级 = 单轮 limit),加列只为语义显式,不为加速;
|
||||||
|
-- * 不动 `linux-fallback-minutes`:它管的是「本地机没开时别让单子饿死」的兜底窗口,
|
||||||
|
-- 与「这一单选谁」是两件事,不能一起删。
|
||||||
|
--
|
||||||
|
-- 回滚(手工):
|
||||||
|
-- ALTER TABLE `biz_file_task` DROP COLUMN `collect_channel`;
|
||||||
|
|
||||||
|
ALTER TABLE `biz_file_task`
|
||||||
|
ADD COLUMN `collect_channel` VARCHAR(16) NULL
|
||||||
|
COMMENT '采集执行通道:LOCAL=本机客户端采/ONLINE=Linux 或外机 Windows;空=按模块默认' AFTER `task_mode`;
|
||||||
+31
-17
@@ -1,38 +1,52 @@
|
|||||||
package com.nanri.aiimage.config;
|
package com.nanri.aiimage.config;
|
||||||
|
|
||||||
|
import com.nanri.aiimage.modules.task.model.CollectChannel;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 采集路由开关的判定口径(2026-10-29):
|
* 采集路由的判定口径(2026-10-31 改为任务级通道):
|
||||||
* 只对 local-enabled 里点名的模块生效,未登记模块一律「非本地」——新模块不能被默认卷进本地优先;
|
* 执行方由 {@code biz_file_task.collect_channel} 这一单自己说,全局 {@code local-enabled} 已撤;
|
||||||
|
* 未登记通道的行按模块默认解释——外观专利/货源默认本机,其余模块默认线上,
|
||||||
|
* 与撤掉的那个全局开关的出厂值(true)逐字等价,历史任务与旧客户端行为不变。
|
||||||
* 兜底窗口下限 1 分钟,配 0/负数不许静默变成「Linux 立刻抢」。
|
* 兜底窗口下限 1 分钟,配 0/负数不许静默变成「Linux 立刻抢」。
|
||||||
*/
|
*/
|
||||||
class CollectRoutingPropertiesTest {
|
class CollectRoutingPropertiesTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void 点名的模块按配置返回且大小写不敏感() {
|
void 默认通道只对专利与货源是本机() {
|
||||||
CollectRoutingProperties properties = new CollectRoutingProperties();
|
assertTrue(CollectChannel.defaultFor(CollectRoutingProperties.MODULE_APPEARANCE_PATENT).isLocal());
|
||||||
properties.setLocalEnabled(Map.of("APPEARANCE_PATENT", true, "SIMILAR_ASIN", false));
|
assertTrue(CollectChannel.defaultFor("appearance_patent").isLocal(), "模块名大小写不应影响判定");
|
||||||
|
assertTrue(CollectChannel.defaultFor(CollectRoutingProperties.MODULE_SIMILAR_ASIN).isLocal());
|
||||||
|
|
||||||
assertTrue(properties.isLocal("APPEARANCE_PATENT"));
|
assertEquals(CollectChannel.ONLINE, CollectChannel.defaultFor("COLLECT_DATA"),
|
||||||
assertTrue(properties.isLocal("appearance_patent"), "模块名大小写不应影响判定");
|
"没点名的模块必须保持 Linux 原有等待窗口,不能被默认卷进本机优先");
|
||||||
assertFalse(properties.isLocal("SIMILAR_ASIN"));
|
assertEquals(CollectChannel.ONLINE, CollectChannel.defaultFor(null));
|
||||||
|
assertEquals(CollectChannel.ONLINE, CollectChannel.defaultFor(" "));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void 未登记的模块按非本地处理() {
|
void 库里存的通道优先于模块默认() {
|
||||||
CollectRoutingProperties properties = new CollectRoutingProperties();
|
assertEquals(CollectChannel.ONLINE,
|
||||||
properties.setLocalEnabled(Map.of("SIMILAR_ASIN", true));
|
CollectChannel.resolve("ONLINE", CollectRoutingProperties.MODULE_APPEARANCE_PATENT),
|
||||||
|
"这一单选了线上,模块默认是机器也不能盖过去");
|
||||||
|
assertEquals(CollectChannel.LOCAL, CollectChannel.resolve(" local ", CollectRoutingProperties.MODULE_SIMILAR_ASIN));
|
||||||
|
assertTrue(CollectChannel.resolve(null, CollectRoutingProperties.MODULE_SIMILAR_ASIN).isLocal(),
|
||||||
|
"空值=未登记,按模块默认");
|
||||||
|
assertTrue(CollectChannel.resolve("未识别的值", CollectRoutingProperties.MODULE_APPEARANCE_PATENT).isLocal(),
|
||||||
|
"脏值必须回落默认,不能让一个坏值把单子永久饿死");
|
||||||
|
}
|
||||||
|
|
||||||
assertFalse(properties.isLocal("COLLECT_DATA"), "没配置的模块必须保持 Linux 原有等待窗口");
|
@Test
|
||||||
assertFalse(properties.isLocal(null));
|
void 界面传入的非法通道值按未登记处理() {
|
||||||
assertFalse(properties.isLocal(" "));
|
assertEquals(CollectChannel.LOCAL, CollectChannel.ofNullable("local"));
|
||||||
|
assertEquals(CollectChannel.ONLINE, CollectChannel.ofNullable("ONLINE"));
|
||||||
|
assertNull(CollectChannel.ofNullable(null), "空=不登记,由服务端按默认解释");
|
||||||
|
assertNull(CollectChannel.ofNullable(" "));
|
||||||
|
assertNull(CollectChannel.ofNullable("BOTH"), "不接受的第三值不能被静默收下降级成本地/线上");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
+18
-11
@@ -64,11 +64,11 @@ class AppearancePatentActivateRoutingTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void 本地采集开启时_activate_走条件更新并刷心跳() {
|
void 本机通道的单_activate_走条件更新并刷心跳() {
|
||||||
FileTaskEntity task = pendingTask();
|
FileTaskEntity task = pendingTask(com.nanri.aiimage.modules.task.model.CollectChannel.LOCAL);
|
||||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task);
|
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task);
|
||||||
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
||||||
AppearancePatentTaskService service = service(routing(true));
|
AppearancePatentTaskService service = service(new CollectRoutingProperties());
|
||||||
|
|
||||||
service.activateTask(TASK_ID, USER_ID);
|
service.activateTask(TASK_ID, USER_ID);
|
||||||
|
|
||||||
@@ -82,9 +82,10 @@ class AppearancePatentActivateRoutingTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void 本地采集关闭时_activate_保持后台语义并明确拒绝() {
|
void 线上通道的单_activate_保持后台语义并明确拒绝() {
|
||||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(pendingTask());
|
when(fileTaskMapper.selectById(TASK_ID))
|
||||||
AppearancePatentTaskService service = service(routing(false));
|
.thenReturn(pendingTask(com.nanri.aiimage.modules.task.model.CollectChannel.ONLINE));
|
||||||
|
AppearancePatentTaskService service = service(new CollectRoutingProperties());
|
||||||
|
|
||||||
BusinessException error = assertThrows(BusinessException.class,
|
BusinessException error = assertThrows(BusinessException.class,
|
||||||
() -> service.activateTask(TASK_ID, USER_ID));
|
() -> service.activateTask(TASK_ID, USER_ID));
|
||||||
@@ -93,18 +94,24 @@ class AppearancePatentActivateRoutingTest {
|
|||||||
verify(fileTaskMapper, never()).update(isNull(), any());
|
verify(fileTaskMapper, never()).update(isNull(), any());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static CollectRoutingProperties routing(boolean local) {
|
@Test
|
||||||
CollectRoutingProperties properties = new CollectRoutingProperties();
|
void 未登记通道的历史单按模块默认走本机() {
|
||||||
properties.setLocalEnabled(Map.of(CollectRoutingProperties.MODULE_APPEARANCE_PATENT, local));
|
FileTaskEntity task = pendingTask(null);
|
||||||
return properties;
|
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task);
|
||||||
|
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
||||||
|
|
||||||
|
service(new CollectRoutingProperties()).activateTask(TASK_ID, USER_ID);
|
||||||
|
|
||||||
|
verify(taskCacheService).touchTaskHeartbeat(TASK_ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
private FileTaskEntity pendingTask() {
|
private FileTaskEntity pendingTask(com.nanri.aiimage.modules.task.model.CollectChannel channel) {
|
||||||
FileTaskEntity task = new FileTaskEntity();
|
FileTaskEntity task = new FileTaskEntity();
|
||||||
task.setId(TASK_ID);
|
task.setId(TASK_ID);
|
||||||
task.setModuleType(AppearancePatentTaskService.MODULE_TYPE);
|
task.setModuleType(AppearancePatentTaskService.MODULE_TYPE);
|
||||||
task.setUserId(USER_ID);
|
task.setUserId(USER_ID);
|
||||||
task.setStatus("PENDING");
|
task.setStatus("PENDING");
|
||||||
|
task.setCollectChannel(channel == null ? null : channel.name());
|
||||||
return task;
|
return task;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+21
@@ -161,6 +161,7 @@ class AppearancePatentCreateTaskSnapshotTest {
|
|||||||
+ " moduleType=" + task.getModuleType()
|
+ " moduleType=" + task.getModuleType()
|
||||||
+ " status=" + task.getStatus()
|
+ " status=" + task.getStatus()
|
||||||
+ " taskMode=" + task.getTaskMode()
|
+ " taskMode=" + task.getTaskMode()
|
||||||
|
+ " collectChannel=" + task.getCollectChannel()
|
||||||
+ " sourceFileCount=" + task.getSourceFileCount()
|
+ " sourceFileCount=" + task.getSourceFileCount()
|
||||||
+ " successFileCount=" + task.getSuccessFileCount()
|
+ " successFileCount=" + task.getSuccessFileCount()
|
||||||
+ " failedFileCount=" + task.getFailedFileCount()
|
+ " failedFileCount=" + task.getFailedFileCount()
|
||||||
@@ -448,6 +449,26 @@ class AppearancePatentCreateTaskSnapshotTest {
|
|||||||
assertTrue(resultEvent.contains(" rowCount=2"), "rowCount 记的是接受行数(4 行夹具去掉 dropped 与全空行):" + resultEvent);
|
assertTrue(resultEvent.contains(" rowCount=2"), "rowCount 记的是接受行数(4 行夹具去掉 dropped 与全空行):" + resultEvent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void 建单按界面选的通道落库() throws Exception {
|
||||||
|
// V183:执行方由这一单自己定(界面 LOCAL/ONLINE 单选框),建单就得把选择写进头行。
|
||||||
|
Harness online = harnessWithFiles("uploads/main.xlsx", mixedWorkbook(), null, null);
|
||||||
|
AppearancePatentParseRequest picked = request(7L, List.of(source("uploads/main.xlsx", "17.xlsx")));
|
||||||
|
picked.setCollectChannel(" online ");
|
||||||
|
online.service().parseAndCreateTask(picked, "device-1");
|
||||||
|
assertTrue(firstTaskInsert(online).contains(" collectChannel=ONLINE"),
|
||||||
|
"选线上的单子必须钉成 ONLINE,否则 activate 会把任务推回本机客户端:" + firstTaskInsert(online));
|
||||||
|
|
||||||
|
Harness legacy = harnessWithFiles("uploads/main.xlsx", mixedWorkbook(), null, null);
|
||||||
|
legacy.service().parseAndCreateTask(request(7L, List.of(source("uploads/main.xlsx", "17.xlsx"))), "device-1");
|
||||||
|
assertTrue(firstTaskInsert(legacy).contains(" collectChannel=null"),
|
||||||
|
"未升级前端不传通道=不登记,由模块默认兜(外观专利默认本机),历史行为不变:" + firstTaskInsert(legacy));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String firstTaskInsert(Harness harness) {
|
||||||
|
return harness.events.stream().filter(e -> e.startsWith("task.insert")).findFirst().orElse("<无 task.insert>");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void 头行先落库再有载荷指针() throws Exception {
|
void 头行先落库再有载荷指针() throws Exception {
|
||||||
Harness harness = harnessWithFiles("uploads/main.xlsx", mixedWorkbook(), null, null);
|
Harness harness = harnessWithFiles("uploads/main.xlsx", mixedWorkbook(), null, null);
|
||||||
|
|||||||
+29
@@ -24,6 +24,7 @@ import org.junit.jupiter.api.BeforeEach;
|
|||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.junit.jupiter.api.extension.ExtendWith;
|
import org.junit.jupiter.api.extension.ExtendWith;
|
||||||
import org.mockito.InjectMocks;
|
import org.mockito.InjectMocks;
|
||||||
|
import org.mockito.ArgumentCaptor;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.Mockito;
|
import org.mockito.Mockito;
|
||||||
import org.mockito.Spy;
|
import org.mockito.Spy;
|
||||||
@@ -41,12 +42,14 @@ import java.util.concurrent.atomic.AtomicLong;
|
|||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
import static org.mockito.ArgumentMatchers.anyInt;
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
import static org.mockito.ArgumentMatchers.anyString;
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
import static org.mockito.ArgumentMatchers.eq;
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
|
import static org.mockito.Mockito.clearInvocations;
|
||||||
import static org.mockito.Mockito.lenient;
|
import static org.mockito.Mockito.lenient;
|
||||||
import static org.mockito.Mockito.times;
|
import static org.mockito.Mockito.times;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
@@ -185,6 +188,32 @@ class SimilarAsinTaskServiceParseDelegationTest {
|
|||||||
assertEquals("uploads/f1.xlsx::1@2", vo.getGroups().get(0).getGroupKey(), "分组键按归一化 fileKey 拼接");
|
assertEquals("uploads/f1.xlsx::1@2", vo.getGroups().get(0).getGroupKey(), "分组键按归一化 fileKey 拼接");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void test_parse_records_collect_channel() throws Exception {
|
||||||
|
// V183:执行方由这一单自己定,界面选的通道必须在建单时落进 collect_channel。
|
||||||
|
File workbook = buildWorkbook(List.<String[]>of(new String[]{"1", "B01A", "US"}));
|
||||||
|
|
||||||
|
assertEquals("ONLINE", insertedChannel(workbook, "uploads/collect-online.xlsx", "ONLINE"));
|
||||||
|
assertEquals("LOCAL", insertedChannel(workbook, "uploads/collect-local.xlsx", " local "));
|
||||||
|
assertNull(insertedChannel(workbook, "uploads/collect-absent.xlsx", null),
|
||||||
|
"不传就留空=按模块默认,未升级前端的行为一字不变");
|
||||||
|
assertNull(insertedChannel(workbook, "uploads/collect-dirty.xlsx", "本机"),
|
||||||
|
"不可识别的值按不登记处理,不把脏值钉进库里让单子永久卡在一侧");
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 跑一次建单,取回落库任务头的通道字段。 */
|
||||||
|
private String insertedChannel(File workbook, String fileKey, String collectChannel) {
|
||||||
|
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
|
||||||
|
SimilarAsinParseRequest request = request(fileKey);
|
||||||
|
request.setCollectChannel(collectChannel);
|
||||||
|
// 只清调用记录、保留赋值 id 的桩:一个用例连跑四次建单,否则 captor 拿到的是上一单的实体
|
||||||
|
clearInvocations(fileTaskMapper);
|
||||||
|
service.parseAndCreateTask(request, "test-device");
|
||||||
|
ArgumentCaptor<FileTaskEntity> captor = ArgumentCaptor.forClass(FileTaskEntity.class);
|
||||||
|
verify(fileTaskMapper).insert(captor.capture());
|
||||||
|
return captor.getValue().getCollectChannel();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void test_parse_delegates_validator() throws Exception {
|
void test_parse_delegates_validator() throws Exception {
|
||||||
// 重复 ASIN+国家 / 非字母数字 ASIN:校验器标记但不改接收结果(与改造前一致)
|
// 重复 ASIN+国家 / 非字母数字 ASIN:校验器标记但不改接收结果(与改造前一致)
|
||||||
|
|||||||
+1
@@ -195,6 +195,7 @@ class SimilarAsinCreateTaskSnapshotTest {
|
|||||||
+ " taskNoPrefix=" + taskNoPrefix(task.getTaskNo())
|
+ " taskNoPrefix=" + taskNoPrefix(task.getTaskNo())
|
||||||
+ " moduleType=" + dash(task.getModuleType())
|
+ " moduleType=" + dash(task.getModuleType())
|
||||||
+ " taskMode=" + dash(task.getTaskMode())
|
+ " taskMode=" + dash(task.getTaskMode())
|
||||||
|
+ " collectChannel=" + dash(task.getCollectChannel())
|
||||||
+ " status=" + dash(task.getStatus())
|
+ " status=" + dash(task.getStatus())
|
||||||
+ " sourceFileCount=" + task.getSourceFileCount()
|
+ " sourceFileCount=" + task.getSourceFileCount()
|
||||||
+ " ok=" + task.getSuccessFileCount()
|
+ " ok=" + task.getSuccessFileCount()
|
||||||
|
|||||||
+3
-4
@@ -20,7 +20,6 @@ class CollectRoutingControllerTest {
|
|||||||
@Test
|
@Test
|
||||||
void 开关默认开启时两个模块都答本地() throws Exception {
|
void 开关默认开启时两个模块都答本地() throws Exception {
|
||||||
CollectRoutingProperties properties = new CollectRoutingProperties();
|
CollectRoutingProperties properties = new CollectRoutingProperties();
|
||||||
properties.setLocalEnabled(Map.of("APPEARANCE_PATENT", true, "SIMILAR_ASIN", true));
|
|
||||||
MockMvc mockMvc = MockMvcBuilders
|
MockMvc mockMvc = MockMvcBuilders
|
||||||
.standaloneSetup(new CollectRoutingController(properties))
|
.standaloneSetup(new CollectRoutingController(properties))
|
||||||
.build();
|
.build();
|
||||||
@@ -33,16 +32,16 @@ class CollectRoutingControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void 关闭本地采集时接口如实回答且未登记模块不影响这两项() throws Exception {
|
void 兜底窗口配置不改变这两项默认() throws Exception {
|
||||||
CollectRoutingProperties properties = new CollectRoutingProperties();
|
CollectRoutingProperties properties = new CollectRoutingProperties();
|
||||||
properties.setLocalEnabled(Map.of("APPEARANCE_PATENT", false, "SIMILAR_ASIN", true));
|
properties.setLinuxFallbackMinutes(90L);
|
||||||
MockMvc mockMvc = MockMvcBuilders
|
MockMvc mockMvc = MockMvcBuilders
|
||||||
.standaloneSetup(new CollectRoutingController(properties))
|
.standaloneSetup(new CollectRoutingController(properties))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
mockMvc.perform(get("/api/collect-routing"))
|
mockMvc.perform(get("/api/collect-routing"))
|
||||||
.andExpect(status().isOk())
|
.andExpect(status().isOk())
|
||||||
.andExpect(jsonPath("$.data.appearancePatentLocal").value(false))
|
.andExpect(jsonPath("$.data.appearancePatentLocal").value(true))
|
||||||
.andExpect(jsonPath("$.data.similarAsinLocal").value(true));
|
.andExpect(jsonPath("$.data.similarAsinLocal").value(true));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+64
@@ -0,0 +1,64 @@
|
|||||||
|
package com.nanri.aiimage.modules.task.model;
|
||||||
|
|
||||||
|
import com.nanri.aiimage.config.CollectRoutingProperties;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* V183 任务级采集通道的判据(建单写入、认领读取、脏值兜底)。
|
||||||
|
*
|
||||||
|
* <p>这里钉死的是「不登记=按模块默认」这条兼容线:外观专利/相似ASIN 读作本机,
|
||||||
|
* 其余模块读作线上,与 V183 之前 {@code AIIMAGE_COLLECT_LOCAL_*} 出厂值 {@code true} 等价。
|
||||||
|
* 一旦默认翻转,全部历史任务与未升级客户端的执行方会集体换边,所以逐条点名。
|
||||||
|
*/
|
||||||
|
class CollectChannelTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void 模块默认外观专利与相似ASIN走本机() {
|
||||||
|
assertEquals(CollectChannel.LOCAL,
|
||||||
|
CollectChannel.defaultFor(CollectRoutingProperties.MODULE_APPEARANCE_PATENT));
|
||||||
|
assertEquals(CollectChannel.LOCAL,
|
||||||
|
CollectChannel.defaultFor(CollectRoutingProperties.MODULE_SIMILAR_ASIN));
|
||||||
|
assertFalse(CollectChannel.defaultFor("DEDUPE").isLocal(), "未点名的模块保持原有的线上语义");
|
||||||
|
assertFalse(CollectChannel.defaultFor(null).isLocal(), "模块名缺失按线上,不给任意单本机优先");
|
||||||
|
assertFalse(CollectChannel.defaultFor(" ").isLocal());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void 模块默认大小写与空白不影响判定() {
|
||||||
|
assertEquals(CollectChannel.LOCAL, CollectChannel.defaultFor("similar_asin"));
|
||||||
|
assertEquals(CollectChannel.LOCAL, CollectChannel.defaultFor(" SIMILAR_ASIN "));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void 库里登记过就按登记的读() {
|
||||||
|
assertEquals(CollectChannel.ONLINE,
|
||||||
|
CollectChannel.resolve("ONLINE", CollectRoutingProperties.MODULE_APPEARANCE_PATENT),
|
||||||
|
"外观专利默认本机,但这一单选了线上就必须读成线上");
|
||||||
|
assertEquals(CollectChannel.ONLINE, CollectChannel.resolve(" online ", CollectRoutingProperties.MODULE_APPEARANCE_PATENT));
|
||||||
|
assertEquals(CollectChannel.LOCAL, CollectChannel.resolve("LOCAL", "DEDUPE"),
|
||||||
|
"选了本机的单子不因模块不是本地默认而被判成线上");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void 未登记或脏值回落到模块默认而不饿死任务() {
|
||||||
|
assertEquals(CollectChannel.LOCAL, CollectChannel.resolve(null, CollectRoutingProperties.MODULE_APPEARANCE_PATENT));
|
||||||
|
assertEquals(CollectChannel.LOCAL, CollectChannel.resolve("", CollectRoutingProperties.MODULE_SIMILAR_ASIN));
|
||||||
|
assertEquals(CollectChannel.ONLINE, CollectChannel.resolve(null, "DEDUPE"));
|
||||||
|
assertEquals(CollectChannel.LOCAL, CollectChannel.resolve("本地", CollectRoutingProperties.MODULE_APPEARANCE_PATENT),
|
||||||
|
"脏值按模块默认兜,不让一个写花的值把单子永久卡在没人领的一侧");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void 建单写入只认两个规范值其余登记为空() {
|
||||||
|
assertEquals("ONLINE", CollectChannel.persistedValue("online"));
|
||||||
|
assertEquals("LOCAL", CollectChannel.persistedValue(" LOCAL "));
|
||||||
|
assertNull(CollectChannel.persistedValue(null), "不登记=留空,由模块默认兜");
|
||||||
|
assertNull(CollectChannel.persistedValue(""));
|
||||||
|
assertNull(CollectChannel.persistedValue("LOCALHOST"), "不可识别的值不留库,回落默认");
|
||||||
|
assertNull(CollectChannel.ofNullable("本地"));
|
||||||
|
}
|
||||||
|
}
|
||||||
+34
-22
@@ -193,41 +193,56 @@ class TaskClientPullServiceTest {
|
|||||||
// ------------------------------------------------------------ 本地采集路由(2026-10-29)
|
// ------------------------------------------------------------ 本地采集路由(2026-10-29)
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void 客户端兜底拉取只认本地模块() {
|
void 客户端兜底拉取不领线上通道的单() {
|
||||||
com.nanri.aiimage.config.CollectRoutingProperties routing =
|
FileTaskEntity online = task(11L, "SIMILAR_ASIN", 10L);
|
||||||
new com.nanri.aiimage.config.CollectRoutingProperties();
|
online.setCollectChannel("ONLINE");
|
||||||
routing.setLocalEnabled(Map.of("SIMILAR_ASIN", false, "COLLECT_DATA", false));
|
when(fileTaskMapper.selectList(any())).thenReturn(List.of(online));
|
||||||
|
|
||||||
List<TaskClientPullVo> result = serviceWithRouting(routing,
|
List<TaskClientPullVo> result = serviceWithRouting(defaultRouting(),
|
||||||
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run"))).pullPendingTasks(USER_ID);
|
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run"))).pullPendingTasks(USER_ID);
|
||||||
|
|
||||||
assertTrue(result.isEmpty(), "模块切到 Linux 后台后客户端不应再拉取");
|
assertTrue(result.isEmpty(), "这一单选了线上采集,客户端领了就是抢跑");
|
||||||
verifyNoInteractions(fileTaskMapper);
|
verify(fileTaskMapper, never()).update(isNull(), any());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void 内部认领对本地模块让位到兜底窗口() {
|
void 客户端兜底拉取照领本机通道的单() {
|
||||||
|
FileTaskEntity local = task(11L, "SIMILAR_ASIN", 10L);
|
||||||
|
local.setCollectChannel("LOCAL");
|
||||||
|
when(fileTaskMapper.selectList(any())).thenReturn(List.of(local));
|
||||||
|
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
||||||
|
when(fileTaskMapper.selectById(11L)).thenReturn(local);
|
||||||
|
|
||||||
|
List<TaskClientPullVo> result = serviceWithRouting(defaultRouting(),
|
||||||
|
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run"))).pullPendingTasks(USER_ID);
|
||||||
|
|
||||||
|
assertEquals(1, result.size(), "本机通道的单必须能被在线客户端领走");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void 内部认领对本机通道让位到兜底窗口() {
|
||||||
com.nanri.aiimage.config.CollectRoutingProperties routing =
|
com.nanri.aiimage.config.CollectRoutingProperties routing =
|
||||||
new com.nanri.aiimage.config.CollectRoutingProperties();
|
new com.nanri.aiimage.config.CollectRoutingProperties();
|
||||||
routing.setLocalEnabled(Map.of("SIMILAR_ASIN", true));
|
|
||||||
routing.setLinuxFallbackMinutes(30L);
|
routing.setLinuxFallbackMinutes(30L);
|
||||||
when(fileTaskMapper.selectList(any())).thenReturn(List.of(task(11L, "SIMILAR_ASIN", 10L)));
|
FileTaskEntity localTask = task(11L, "SIMILAR_ASIN", 10L);
|
||||||
|
localTask.setCollectChannel("LOCAL");
|
||||||
|
when(fileTaskMapper.selectList(any())).thenReturn(List.of(localTask));
|
||||||
|
|
||||||
List<TaskClientPullVo> result = serviceWithRouting(routing,
|
List<TaskClientPullVo> result = serviceWithRouting(routing,
|
||||||
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run")))
|
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run")))
|
||||||
.pullPendingTasksInternal(List.of("SIMILAR_ASIN"));
|
.pullPendingTasksInternal(List.of("SIMILAR_ASIN"));
|
||||||
|
|
||||||
assertTrue(result.isEmpty(), "本地采集模块在兜底窗口内必须让位给本地客户端");
|
assertTrue(result.isEmpty(), "本机通道的单在兜底窗口内必须让位给本地客户端");
|
||||||
verify(fileTaskMapper, never()).update(isNull(), any());
|
verify(fileTaskMapper, never()).update(isNull(), any());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void 内部认领超过兜底窗口后接管本地模块() {
|
void 内部认领超过兜底窗口后接管本机通道的单() {
|
||||||
com.nanri.aiimage.config.CollectRoutingProperties routing =
|
com.nanri.aiimage.config.CollectRoutingProperties routing =
|
||||||
new com.nanri.aiimage.config.CollectRoutingProperties();
|
new com.nanri.aiimage.config.CollectRoutingProperties();
|
||||||
routing.setLocalEnabled(Map.of("SIMILAR_ASIN", true));
|
|
||||||
routing.setLinuxFallbackMinutes(30L);
|
routing.setLinuxFallbackMinutes(30L);
|
||||||
FileTaskEntity candidate = task(11L, "SIMILAR_ASIN", 40L);
|
FileTaskEntity candidate = task(11L, "SIMILAR_ASIN", 40L);
|
||||||
|
candidate.setCollectChannel("LOCAL");
|
||||||
when(fileTaskMapper.selectList(any())).thenReturn(List.of(candidate));
|
when(fileTaskMapper.selectList(any())).thenReturn(List.of(candidate));
|
||||||
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
||||||
when(fileTaskMapper.selectById(11L)).thenReturn(candidate);
|
when(fileTaskMapper.selectById(11L)).thenReturn(candidate);
|
||||||
@@ -236,16 +251,16 @@ class TaskClientPullServiceTest {
|
|||||||
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run")))
|
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run")))
|
||||||
.pullPendingTasksInternal(List.of("SIMILAR_ASIN"));
|
.pullPendingTasksInternal(List.of("SIMILAR_ASIN"));
|
||||||
|
|
||||||
assertEquals(1, result.size(), "本地长时间没人领,Linux 必须兜底接管");
|
assertEquals(1, result.size(), "本机长时间没人领,Linux 必须兜底接管");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void 内部认领对非本地模块保持原等待窗口() {
|
void 内部认领对线上通道不受兜底窗口影响() {
|
||||||
com.nanri.aiimage.config.CollectRoutingProperties routing =
|
com.nanri.aiimage.config.CollectRoutingProperties routing =
|
||||||
new com.nanri.aiimage.config.CollectRoutingProperties();
|
new com.nanri.aiimage.config.CollectRoutingProperties();
|
||||||
routing.setLocalEnabled(Map.of("SIMILAR_ASIN", true));
|
|
||||||
routing.setLinuxFallbackMinutes(30L);
|
routing.setLinuxFallbackMinutes(30L);
|
||||||
FileTaskEntity candidate = task(21L, "COLLECT_DATA", 10L);
|
FileTaskEntity candidate = task(21L, "COLLECT_DATA", 10L);
|
||||||
|
candidate.setCollectChannel("ONLINE");
|
||||||
when(fileTaskMapper.selectList(any())).thenReturn(List.of(candidate));
|
when(fileTaskMapper.selectList(any())).thenReturn(List.of(candidate));
|
||||||
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
||||||
when(fileTaskMapper.selectById(21L)).thenReturn(candidate);
|
when(fileTaskMapper.selectById(21L)).thenReturn(candidate);
|
||||||
@@ -254,19 +269,16 @@ class TaskClientPullServiceTest {
|
|||||||
new StubHandler("COLLECT_DATA", payload("collect-data-run")))
|
new StubHandler("COLLECT_DATA", payload("collect-data-run")))
|
||||||
.pullPendingTasksInternal(List.of("COLLECT_DATA"));
|
.pullPendingTasksInternal(List.of("COLLECT_DATA"));
|
||||||
|
|
||||||
assertEquals(1, result.size(), "未登记本地开关的模块不受兜底窗口影响");
|
assertEquals(1, result.size(), "选了线上的单子不能被本地优先的窗口拖住");
|
||||||
}
|
}
|
||||||
|
|
||||||
private TaskClientPullService service(ClientTaskPullSpi... handlers) {
|
private TaskClientPullService service(ClientTaskPullSpi... handlers) {
|
||||||
return serviceWithRouting(defaultRouting(), handlers);
|
return serviceWithRouting(defaultRouting(), handlers);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 默认路由:两个模块都按本地采集(现有用例的既有语义)。 */
|
/** 默认路由:兜底窗口取出厂 30 分钟;通道由每条任务自己带(V183),不在这里配全局。 */
|
||||||
private static com.nanri.aiimage.config.CollectRoutingProperties defaultRouting() {
|
private static com.nanri.aiimage.config.CollectRoutingProperties defaultRouting() {
|
||||||
com.nanri.aiimage.config.CollectRoutingProperties routing =
|
return new com.nanri.aiimage.config.CollectRoutingProperties();
|
||||||
new com.nanri.aiimage.config.CollectRoutingProperties();
|
|
||||||
routing.setLocalEnabled(Map.of("SIMILAR_ASIN", true, "COLLECT_DATA", true));
|
|
||||||
return routing;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private TaskClientPullService serviceWithRouting(
|
private TaskClientPullService serviceWithRouting(
|
||||||
|
|||||||
+2
@@ -32,12 +32,14 @@ class TaskRetryCloneSupportTest {
|
|||||||
void 克隆任务头保留输入与代数并清空结果计数() {
|
void 克隆任务头保留输入与代数并清空结果计数() {
|
||||||
FileTaskMapperHolder holder = new FileTaskMapperHolder();
|
FileTaskMapperHolder holder = new FileTaskMapperHolder();
|
||||||
FileTaskEntity original = holder.original();
|
FileTaskEntity original = holder.original();
|
||||||
|
original.setCollectChannel("ONLINE");
|
||||||
TaskRetryCloneSupport support = support(mock(FileResultMapper.class), mock(TaskScopeStateMapper.class));
|
TaskRetryCloneSupport support = support(mock(FileResultMapper.class), mock(TaskScopeStateMapper.class));
|
||||||
|
|
||||||
FileTaskEntity child = support.buildChild(original, "{\"parsedPayloadRef\":\"p\"}");
|
FileTaskEntity child = support.buildChild(original, "{\"parsedPayloadRef\":\"p\"}");
|
||||||
|
|
||||||
assertEquals("PENDING", child.getStatus());
|
assertEquals("PENDING", child.getStatus());
|
||||||
assertEquals("SIMILAR_ASIN", child.getModuleType());
|
assertEquals("SIMILAR_ASIN", child.getModuleType());
|
||||||
|
assertEquals("ONLINE", child.getCollectChannel(), "重试不得悄悄换执行方:通道随原单继承");
|
||||||
assertEquals(original.getRequestJson(), child.getRequestJson());
|
assertEquals(original.getRequestJson(), child.getRequestJson());
|
||||||
assertEquals("{\"parsedPayloadRef\":\"p\"}", child.getResultJson());
|
assertEquals("{\"parsedPayloadRef\":\"p\"}", child.getResultJson());
|
||||||
assertEquals(977L, child.getUserId());
|
assertEquals(977L, child.getUserId());
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
== 单文件建单 ==
|
== 单文件建单 ==
|
||||||
task.insert taskNo=APPEARANCE_PATENT-<snowflake> moduleType=APPEARANCE_PATENT status=PENDING taskMode=PYTHON_QUEUE sourceFileCount=1 successFileCount=0 failedFileCount=0 userId=7 createdBy=user:7 deviceId=device-1 requestJson.keys=[files,fileKey,originalFilename,relativePath,user_id,ai_prompt,api_key] requestJson.digest=e9c718bc06a1 resultJson={}
|
task.insert taskNo=APPEARANCE_PATENT-<snowflake> moduleType=APPEARANCE_PATENT status=PENDING taskMode=PYTHON_QUEUE collectChannel=null sourceFileCount=1 successFileCount=0 failedFileCount=0 userId=7 createdBy=user:7 deviceId=device-1 requestJson.keys=[files,fileKey,originalFilename,relativePath,user_id,ai_prompt,api_key,collect_channel] requestJson.digest=8a10649faa72 resultJson={}
|
||||||
payload.storeParsed module=APPEARANCE_PATENT taskId=1001 scopeHash=5aef06a0d982 entry=latest encodeAsJson=false content.len=1131 content.digest=3f9589e6833c
|
payload.storeParsed module=APPEARANCE_PATENT taskId=1001 scopeHash=5aef06a0d982 entry=latest encodeAsJson=false content.len=1131 content.digest=3f9589e6833c
|
||||||
task.update id=1001 resultJson.keys=[aiPrompt,apiKey,sourceFileKeys,parsedPayloadRef,ownerInstanceId] resultJson={"aiPrompt":"请排查侵权风险","apiKey":"sk-test-0001","sourceFileKeys":["uploads/main.xlsx"],"parsedPayloadRef":"ptr://task-parsed/5aef06a0d982/latest","ownerInstanceId":"instance-A"}
|
task.update id=1001 resultJson.keys=[aiPrompt,apiKey,sourceFileKeys,parsedPayloadRef,ownerInstanceId] resultJson={"aiPrompt":"请排查侵权风险","apiKey":"sk-test-0001","sourceFileKeys":["uploads/main.xlsx"],"parsedPayloadRef":"ptr://task-parsed/5aef06a0d982/latest","ownerInstanceId":"instance-A"}
|
||||||
result.insert taskId=1001 moduleType=APPEARANCE_PATENT sourceFilename=17.xlsx sourceFileUrl=uploads/main.xlsx rowCount=2 success=null userId=7
|
result.insert taskId=1001 moduleType=APPEARANCE_PATENT sourceFilename=17.xlsx sourceFileUrl=uploads/main.xlsx rowCount=2 success=null userId=7
|
||||||
@@ -7,7 +7,7 @@ scope.insert taskId=1001 moduleType=APPEARANCE_PATENT scopeKey=uploads/main.xlsx
|
|||||||
vo: taskId=1001 sourceFilename=17.xlsx sourceFileCount=1 totalRows=3 acceptedRows=2 droppedRows=1 groupCount=1 aiPrompt=请排查侵权风险 items=0 groups=0
|
vo: taskId=1001 sourceFilename=17.xlsx sourceFileCount=1 totalRows=3 acceptedRows=2 droppedRows=1 groupCount=1 aiPrompt=请排查侵权风险 items=0 groups=0
|
||||||
|
|
||||||
== 双文件聚合 ==
|
== 双文件聚合 ==
|
||||||
task.insert taskNo=APPEARANCE_PATENT-<snowflake> moduleType=APPEARANCE_PATENT status=PENDING taskMode=PYTHON_QUEUE sourceFileCount=2 successFileCount=0 failedFileCount=0 userId=7 createdBy=user:7 deviceId=null requestJson.keys=[files,fileKey,originalFilename,relativePath,fileKey,originalFilename,relativePath,user_id,ai_prompt,api_key] requestJson.digest=2f72932983ea resultJson={}
|
task.insert taskNo=APPEARANCE_PATENT-<snowflake> moduleType=APPEARANCE_PATENT status=PENDING taskMode=PYTHON_QUEUE collectChannel=null sourceFileCount=2 successFileCount=0 failedFileCount=0 userId=7 createdBy=user:7 deviceId=null requestJson.keys=[files,fileKey,originalFilename,relativePath,fileKey,originalFilename,relativePath,user_id,ai_prompt,api_key,collect_channel] requestJson.digest=2b44afc83905 resultJson={}
|
||||||
payload.storeParsed module=APPEARANCE_PATENT taskId=1001 scopeHash=c822dc131109 entry=latest encodeAsJson=false content.len=1610 content.digest=e2bb1a0e4ab4
|
payload.storeParsed module=APPEARANCE_PATENT taskId=1001 scopeHash=c822dc131109 entry=latest encodeAsJson=false content.len=1610 content.digest=e2bb1a0e4ab4
|
||||||
task.update id=1001 resultJson.keys=[aiPrompt,apiKey,sourceFileKeys,parsedPayloadRef,ownerInstanceId] resultJson={"aiPrompt":"请排查侵权风险","apiKey":"sk-test-0001","sourceFileKeys":["uploads/a.xlsx","uploads/b.xlsx"],"parsedPayloadRef":"ptr://task-parsed/c822dc131109/latest","ownerInstanceId":"instance-A"}
|
task.update id=1001 resultJson.keys=[aiPrompt,apiKey,sourceFileKeys,parsedPayloadRef,ownerInstanceId] resultJson={"aiPrompt":"请排查侵权风险","apiKey":"sk-test-0001","sourceFileKeys":["uploads/a.xlsx","uploads/b.xlsx"],"parsedPayloadRef":"ptr://task-parsed/c822dc131109/latest","ownerInstanceId":"instance-A"}
|
||||||
result.insert taskId=1001 moduleType=APPEARANCE_PATENT sourceFilename=a.xlsx 等 2 个文件 sourceFileUrl=aggregate:7b002a4b8031c0f8ee99822337979dfbe4720f1c3bf262701d04767a09b9dd36 rowCount=3 success=null userId=7
|
result.insert taskId=1001 moduleType=APPEARANCE_PATENT sourceFilename=a.xlsx 等 2 个文件 sourceFileUrl=aggregate:7b002a4b8031c0f8ee99822337979dfbe4720f1c3bf262701d04767a09b9dd36 rowCount=3 success=null userId=7
|
||||||
@@ -25,5 +25,5 @@ fileKey=空白 -> BusinessException: fileKey 不能为空
|
|||||||
events=5(四格有夹具的场景也必须零落库)
|
events=5(四格有夹具的场景也必须零落库)
|
||||||
|
|
||||||
== 载荷存储失败时的副作用边界(本支建单无事务) ==
|
== 载荷存储失败时的副作用边界(本支建单无事务) ==
|
||||||
task.insert taskNo=APPEARANCE_PATENT-<snowflake> moduleType=APPEARANCE_PATENT status=PENDING taskMode=PYTHON_QUEUE sourceFileCount=1 successFileCount=0 failedFileCount=0 userId=7 createdBy=user:7 deviceId=d requestJson.keys=[files,fileKey,originalFilename,relativePath,user_id,ai_prompt,api_key] requestJson.digest=e9c718bc06a1 resultJson={}
|
task.insert taskNo=APPEARANCE_PATENT-<snowflake> moduleType=APPEARANCE_PATENT status=PENDING taskMode=PYTHON_QUEUE collectChannel=null sourceFileCount=1 successFileCount=0 failedFileCount=0 userId=7 createdBy=user:7 deviceId=d requestJson.keys=[files,fileKey,originalFilename,relativePath,user_id,ai_prompt,api_key,collect_channel] requestJson.digest=8a10649faa72 resultJson={}
|
||||||
outcome=共享临时存储关闭 -> BusinessException: 外观专利parsed payload必须写入共享临时存储 RustFS,请检查 aiimage.transient-storage 配置
|
outcome=共享临时存储关闭 -> BusinessException: 外观专利parsed payload必须写入共享临时存储 RustFS,请检查 aiimage.transient-storage 配置
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user