diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java index d75e04999..69e9268ca 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java @@ -36,6 +36,7 @@ import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentTaskD import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentTaskItemVo; import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentRowOutcome; import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentSheetBuilder; +import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentTaskOwnership; import com.nanri.aiimage.modules.file.service.LocalFileStorageService; import com.nanri.aiimage.modules.file.service.oss.OssStorageService; import com.nanri.aiimage.modules.task.mapper.FileResultMapper; @@ -673,8 +674,9 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline原样搬移 + * (3A 拆薄第二笔):owner 优先读 {@code owner_instance_id} 列、回落 {@code resultJson.ownerInstanceId} + * 快照,{@code scopeKey} 按 {@code ":owner:"} 尾段解析,谓词与文案一字未改。 + * + *

为什么现在搬得动、以前搬不动。这套谓词一直只有服务侧在用;A 聚类(陈旧任务扫描与 + * 二次判死)搬出去之后也要用同一套(跨实例接管那格 WARN),留在服务里就只有两条路——让扫描件 + * 回调服务,或者把三枚谓词再抄一遍。后者正是 + * {@code TaskLifecycleDebtRatchetTest} 钉住的东西(「同一条安全谓词被手抄的遍数」,实测 130 遍 + * 只许降),所以这里选择把谓词收成一枚可复用的本地件,而不是多一处抄本。 + * + *

⚠ 一处可观测差异,如实登记:两条 WARN 的 logger 名从 + * {@code ...appearancepatent.service.AppearancePatentTaskService} 变成本类 + * ({@code ...service.support.AppearancePatentTaskOwnership})。消息文本、参数顺序、级别 + * 一个字没动;按 logger 名做的日志检索要跟着换,别把它读成「日志丢了」。 + */ +@Slf4j +public class AppearancePatentTaskOwnership { + + private static final String OWNER_MARKER = ":owner:"; + + private final InstanceMetadata instanceMetadata; + private final ObjectMapper objectMapper; + + public AppearancePatentTaskOwnership(InstanceMetadata instanceMetadata, ObjectMapper objectMapper) { + this.instanceMetadata = instanceMetadata; + this.objectMapper = objectMapper; + } + + /** 归属实例域那枚 scopeKey:本支挂组装 job 与巡检恢复都用它。 */ + public String buildTaskOwnerScopeKey(FileTaskEntity task) { + Long taskId = task == null ? null : task.getId(); + return "task:" + taskId + ":owner:" + firstNonBlank(ownerFromTask(task), currentInstanceId()); + } + + public String currentInstanceId() { + String instanceId = instanceMetadata == null ? null : instanceMetadata.getInstanceId(); + return firstNonBlank(instanceId, "unknown-instance"); + } + + /** + * 归属不符即拒。服务侧那枚 {@code protected} 覆写现在只是转发到这里—— + * {@link TaskOwnerMismatchException} 的四个入参顺序照旧(taskId/operation/owner/current)。 + */ + public void rejectIfOwnedByAnotherInstance(FileTaskEntity task, String operation) { + String owner = ownerFromTask(task); + if (isOwnerCurrent(owner)) { + return; + } + log.warn("[appearance-patent] reject task operation because owner is another instance taskId={} operation={} owner={} current={}", + task == null ? null : task.getId(), operation, owner, currentInstanceId()); + throw new TaskOwnerMismatchException( + task == null ? null : task.getId(), + operation, + owner, + currentInstanceId()); + } + + public boolean isOwnerCurrent(String owner) { + return owner == null || owner.isBlank() || Objects.equals(owner, currentInstanceId()); + } + + /** + * 优先读 {@code owner_instance_id} 列:兜底拉取认领({@code TaskClientPullService.claim})会转交该列, + * 而 {@code resultJson} 里的 {@code ownerInstanceId} 只是 parse 时的快照,转交后不同步 —— + * 只读快照会把已在别处认领的任务误拒并标失败(2026-09-30 内部认领上线实测)。 + */ + public String ownerFromTask(FileTaskEntity task) { + if (task == null) { + return null; + } + if (task.getOwnerInstanceId() != null && !task.getOwnerInstanceId().isBlank()) { + return task.getOwnerInstanceId(); + } + if (task.getResultJson() == null || task.getResultJson().isBlank()) { + return null; + } + try { + String owner = objectMapper.readTree(task.getResultJson()).path("ownerInstanceId").asText(""); + return owner.isBlank() ? null : owner; + } catch (Exception ex) { + log.warn("[appearance-patent] read task owner failed taskId={} err={}", + task.getId(), ex.getMessage()); + return null; + } + } + + public String ownerFromScopeKey(String scopeKey) { + if (scopeKey == null || scopeKey.isBlank()) { + return null; + } + int index = scopeKey.lastIndexOf(OWNER_MARKER); + if (index < 0) { + return null; + } + String owner = scopeKey.substring(index + OWNER_MARKER.length()).trim(); + return owner.isBlank() ? null : owner; + } + + private static String firstNonBlank(String preferred, String fallback) { + return preferred == null || preferred.isBlank() ? fallback : preferred.trim(); + } +}