From 8c9141d6617b941afbde88bb970396c134aa6662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Tue, 29 Sep 2026 00:14:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(taskcenter):=20=E8=AE=BE=E5=A4=87=E8=8A=B1?= =?UTF-8?q?=E5=90=8D=E5=86=8C=20UNION=20=E6=98=BE=E5=BC=8F=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=20device=5Fid=20=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit device_log_file.device_id 是 utf8mb4_0900_ai_ci,两张任务表是 utf8mb4_general_ci, 三个 UNION 分支混排规则在运行期直接报 ERROR 1271(生产库空跑 21 条语句时发现, 设备页 4 条 SQL 全挂)。日志侧显式 COLLATE utf8mb4_general_ci 归一,并加回归测试钉住。 --- .../taskcenter/mapper/TaskCenterQueryMapper.java | 6 +++++- .../mapper/TaskCenterQueryMapperSqlTest.java | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java index bb9f5226a..f72c6a5da 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java @@ -82,8 +82,12 @@ public interface TaskCenterQueryMapper { /** * 日志设备原始行:客户端日志、uid 非空(为空无法归组)、近 N 天有上报。 * {@code createdAt} 恒空,只为了与任务侧列对齐。 + * + *

{@code device_id} 必须显式 COLLATE:本表列是 utf8mb4_0900_ai_ci,两张任务表是 + * utf8mb4_general_ci,三个 UNION 分支混排规则会直接报 ERROR 1271。

*/ - String LOG_DEVICE_ROWS = "(SELECT d.device_id AS deviceId, d.device_name AS deviceName," + String LOG_DEVICE_ROWS = "(SELECT d.device_id COLLATE utf8mb4_general_ci AS deviceId," + + " d.device_name AS deviceName," + " COALESCE(d.last_upload_at, d.updated_at) AS activityAt, NULL AS createdAt" + " FROM device_log_file d" + " WHERE d.source = 'client'" diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapperSqlTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapperSqlTest.java index 4a70f3818..6c4ac0ddb 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapperSqlTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapperSqlTest.java @@ -119,6 +119,20 @@ class TaskCenterQueryMapperSqlTest { assertEquals(6, boundSql.getParameterMappings().size(), "任务窗口×2 + 日志窗口 + 账号集合×3"); } + /** + * 日志表 device_id 是 utf8mb4_0900_ai_ci,任务表是 utf8mb4_general_ci;不显式 COLLATE + * 三个 UNION 分支混排会报 ERROR 1271(本地不连库测不出,生产库空跑才能发现)。 + */ + @Test + void rosterDeviceIdUnifiesCollationBeforeUnion() { + LocalDateTime since = LocalDateTime.of(2026, 9, 1, 0, 0); + String sql = sqlOf(render("countRosterDevices", + params("userIds", null, "taskSince", since, "logSince", since))); + + assertTrue(sql.contains("d.device_id COLLATE utf8mb4_general_ci AS deviceId"), + "日志侧 device_id 显式统一排序规则"); + } + @Test void rosterListAggregatesNameAndRecencyPerDevice() { LocalDateTime since = LocalDateTime.of(2026, 9, 1, 0, 0);