From 27a7cd0f82394381802d9c1949288e6a5972790b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Wed, 30 Sep 2026 12:14:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E5=85=9C=E5=BA=95?= =?UTF-8?q?=E6=8B=89=E5=8F=96):=20=E8=AE=A4=E9=A2=86=E8=BD=AC=E4=BA=A4=20o?= =?UTF-8?q?wner=5Finstance=5Fid=20=E4=B8=94=E5=BD=92=E5=B1=9E=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=94=B9=E8=AF=BB=E5=88=97=20=E2=80=94=E2=80=94=20?= =?UTF-8?q?=E8=AE=A4=E9=A2=86=E5=9C=A8=20server-121=20=E8=80=8C=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=20parse=20=E8=90=BD=20server-110=20=E6=97=B6,=20?= =?UTF-8?q?=E7=BB=84=E8=A3=85=E8=BD=BD=E8=8D=B7=E8=A2=AB=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=8B=92=E7=BB=9D=E5=B9=B6=E8=AF=AF=E6=A0=87?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5;=20resultJson=20=E9=87=8C=E7=9A=84=20ownerIn?= =?UTF-8?q?stanceId=20=E5=8F=AA=E6=98=AF=20parse=20=E5=BF=AB=E7=85=A7,=20?= =?UTF-8?q?=E8=BD=AC=E4=BA=A4=E5=90=8E=E4=B8=8D=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AppearancePatentTaskService.java | 11 ++++++++++- .../modules/task/service/TaskClientPullService.java | 5 ++++- 2 files changed, 14 insertions(+), 2 deletions(-) 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 745d0243a..03b515f69 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 @@ -2005,7 +2005,16 @@ public class AppearancePatentTaskService { } private String ownerFromTask(FileTaskEntity task) { - if (task == null || task.getResultJson() == null || task.getResultJson().isBlank()) { + if (task == null) { + return null; + } + // 优先读 owner_instance_id 列:兜底拉取认领(TaskClientPullService.claim)会转交该列, + // 而 resultJson 里的 ownerInstanceId 只是 parse 时的快照,转交后不同步 —— + // 只读快照会把已在别处认领的任务误拒并标失败(2026-09-30 内部认领上线实测)。 + if (task.getOwnerInstanceId() != null && !task.getOwnerInstanceId().isBlank()) { + return task.getOwnerInstanceId(); + } + if (task.getResultJson() == null || task.getResultJson().isBlank()) { return null; } try { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java index 0d0953fea..249351e36 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskClientPullService.java @@ -231,7 +231,10 @@ public class TaskClientPullService { /** * 条件更新认领:只有把 PENDING 翻成 RUNNING 的一方算领取成功。 - * PENDING 无活跃 owner(页面尚未执行),认领即接管,因此不做归属转发。 + * PENDING 无活跃 owner(页面尚未执行),认领即接管 —— owner_instance_id 一并转交 + * 给认领实例,否则后续 buildQueuePayload/回传的「任务归属实例」校验 + * (ensureTaskOwnedByCurrentInstance)会拒绝(2026-09-30 内部认领上线实测: + * 任务 parse 落 server-110、认领在 server-121,组装载荷被拒并误标失败)。 */ private boolean claim(Long taskId) { return fileTaskMapper.update(null, new LambdaUpdateWrapper()