From d349bc1a7df8391ca171498abf277a517d908d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com>
Date: Fri, 9 Oct 2026 14:43:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=AE=B9=E5=BF=8D):=20=E5=9C=A8=E8=B7=91?=
=?UTF-8?q?=E5=88=A4=E5=AE=9A=20countLiveWorkFor=E2=80=94=E2=80=94?=
=?UTF-8?q?=E4=B8=89=E5=BC=A0=E8=A1=A8=E5=90=84=E5=B8=A6=2015=20=E5=88=86?=
=?UTF-8?q?=E9=92=9F=E6=96=B0=E9=B2=9C=E5=BA=A6=E3=80=81=E8=AF=BB=E5=A4=B1?=
=?UTF-8?q?=E8=B4=A5=20fail-closed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
三段标量子查询相加而非 UNION(UNION 会因列级排序规则差异报 1271)。
清单口径来自生产 information_schema 普查而非扫迁移文件:后者实测恒漏报
(V1 建表列名不带反引号、老表 user_id 来自后续 ALTER、现网有 dump 重建漂移),
静默少报的尺子比没尺子更糟,故改为「登记的表必须出现在 SQL 里」的对照钉。
---
.../common/mapper/AdminUserMapper.java | 12 +++
.../mapper/common/AdminUserMapper.xml | 18 ++++
.../mapper/AdminUserLiveWorkSqlTest.java | 94 +++++++++++++++++++
3 files changed, 124 insertions(+)
create mode 100644 backend-java/src/test/java/com/nanri/aiimage/common/mapper/AdminUserLiveWorkSqlTest.java
diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/mapper/AdminUserMapper.java b/backend-java/src/main/java/com/nanri/aiimage/common/mapper/AdminUserMapper.java
index a1e3b8794..11bf2c372 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/common/mapper/AdminUserMapper.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/common/mapper/AdminUserMapper.java
@@ -32,4 +32,16 @@ public interface AdminUserMapper extends BaseMapper
只读、走 {@code timeout="2"}:读失败或超时由调用方按「没有在跑」处理(fail-closed), + * 绝不因为这条查询而放行。清单口径见 {@code AdminUserLiveWorkSqlTest}。
+ * + * @param userId 令牌 subject 解析出的用户 id + * @param deviceId 令牌 claim 里的 deviceId;为空则只按 user_id 匹配 + * @return 三张在跑表里新鲜运行的行数合计 + */ + int countLiveWorkFor(@Param("userId") Long userId, @Param("deviceId") String deviceId); } diff --git a/backend-java/src/main/resources/mapper/common/AdminUserMapper.xml b/backend-java/src/main/resources/mapper/common/AdminUserMapper.xml index d54955b3d..2bb971e74 100644 --- a/backend-java/src/main/resources/mapper/common/AdminUserMapper.xml +++ b/backend-java/src/main/resources/mapper/common/AdminUserMapper.xml @@ -19,4 +19,22 @@ WHERE role = 'company_super_admin' AND company_id = #{companyId} + + + + diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/mapper/AdminUserLiveWorkSqlTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/mapper/AdminUserLiveWorkSqlTest.java new file mode 100644 index 000000000..1c1d1a71e --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/common/mapper/AdminUserLiveWorkSqlTest.java @@ -0,0 +1,94 @@ +package com.nanri.aiimage.common.mapper; + +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.nanri.aiimage.testutil.MapperXmlSupport; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.mapping.MappedStatement; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * 容忍闸只认「真的有任务在跑」。这张清单必须由迁移文件反推,不许手写——手写会漏: + * 设计阶段我只想到 biz_file_task 与 brand_crawl_tasks,实测 biz_price_track_loop_run 也在跑同类任务。 + */ +class AdminUserLiveWorkSqlTest { + + private static MybatisConfiguration configuration; + + /** 计入容忍的三张表;少一张就有一类任务在跑却拿不到容忍。 */ + private static final List这里刻意【不】去扫迁移文件反推「哪些表同时有 user_id 与 status」——试过,且它恒漏报: + * V1 时代的建表语句列名不带反引号、老表的 {@code user_id} 是后续 ALTER 加的、 + * 而现网还有 dump 重建造成的历史漂移({@code biz_file_task} 与 {@code brand_crawl_tasks} + * 就扫不出来)。一把静默少报的尺子比没有尺子更糟:它会在"新任务类型拿不到容忍"那天正好显示全绿。 + * 分母的权威来源是生产 {@code information_schema} 的只读普查(命令见本类底部注释与 + * docs/superpowers/plans/2026-10-09-session-tolerance-while-task-running.md), + * 新增同类表时必须同时改上面两个清单和本条 SQL,评审时对这两处各提一次问题即可。
+ */ + @Test + void classificationMatchesRenderedSql() { + String sql = sqlOf("countLiveWorkFor", Map.of("userId", 7L, "deviceId", "d")); + for (String table : IN_SCOPE_LIVE_TABLES) { + assertThat(sql).withFailMessage("表 %s 登记为在跑集合,却没出现在 SQL 里——这类任务拿不到容忍", table) + .contains(table); + } + for (String table : EXCLUDED_TABLES) { + assertThat(sql).withFailMessage("表 %s 已被显式排除,不应出现在 SQL 里", table).doesNotContain(table); + } + } + + /* + * 分母普查(只读,随计划复核一起跑): + * PYTHONUTF8=1 python scripts/_probe_notif_anomaly_scan.py --sqlfile <(见计划 §Task 3 Step 1) + * 2026-10-09 实测:全库有 status 列的表 12 张(已排除 *_bak_*),其中同时有 user_id 的 7 张 = + * 本类两个清单之和 5 张 + 2 张 _bak_e2e_20261006 备份表(备份表不参与判定,故不出现在上面)。 + */ +}