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);