fix(phase-5.2): 消项 CR 第二轮 P1/P2/P3(通道/证据链/交付时序/后管证据页)

This commit is contained in:
2026-10-31 21:12:18 +08:00
parent a4e4456b50
commit 91d36327f9
61 changed files with 2833 additions and 311 deletions
@@ -37,6 +37,8 @@ AIIMAGE_OSS_ACCESS_KEY_SECRET=change-me
# 任务异常现场证据件(v1.2 Phase 3):独立桶与保留期必须显式配置;桶不得复用 nanri-ai-images。
AIIMAGE_EVIDENCE_OSS_BUCKET=task-evidence
AIIMAGE_EVIDENCE_RETENTION_DAYS=7
AIIMAGE_EVIDENCE_RETENTION_CRON=0 30 3 * * *
AIIMAGE_EVIDENCE_MAX_FILE_BYTES=67108864
AIIMAGE_EVIDENCE_KEY_PREFIX=task-evidence/
# 工作台客户端包直传预签名有效期(秒);90MB 级包在慢公网入口需要更长窗口。
@@ -0,0 +1,50 @@
-- V184: 兜底拉取与证据保留期两条取页路径的缺失索引(CR 第二轮 P1-1 同批 / P2-1)
--
-- 1) biz_file_task(status, module_type, created_at)
-- TaskClientPullService 的通道谓词从 Java 侧下推进 SQL 之后,内部认领(Linux worker)这一支
-- 的真实谓词就是 status='PENDING' AND module_type IN (...) AND created_at < ? ORDER BY created_at。
-- 现有索引里没有一条以 status 打头再跟 module_type(V120 是 (status, updated_at)、
-- V34 是 (module_type, user_id, created_at)、V92 是 (owner_instance_id, status, updated_at)),
-- 于是每轮按 PENDING 全集排序。
-- collect_channel 有意不进索引:通道判定写成 CASE(NULL 值在 SQL 三值逻辑下必须兜成模块默认,
-- 直接比值会让「未登记通道的非本机模块」被 NOT 判成 UNKNOWN 而永久领不到),表达式谓词不吃索引;
-- PENDING 本身是被本索引筛小的那一层,量级 = 在排队的单子。
-- 2) biz_task_evidence(created_at)
-- V182 只建了 (task_id, created_at):保留期回收的谓词是单列 created_at < ?,前导列不符 ⇒
-- purgeExpired 每一批全表扫,而这张表按「异常即产件」只增不减。
--
-- 风险:ALTER TABLE ADD INDEX 需申请元数据锁(MySQL 8 在线 DDL,INPLACE),建议低峰执行;
-- 本迁移按 information_schema 判存,重跑不会因索引已存在而失败。
-- 回滚(手工):
-- ALTER TABLE biz_file_task DROP INDEX idx_biz_file_task_status_module_created;
-- ALTER TABLE biz_task_evidence DROP INDEX idx_task_evidence_created_at;
SET @db_name = DATABASE();
-- 1) biz_file_task(status, module_type, created_at)
SET @idx_exists := (
SELECT COUNT(*) FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'biz_file_task'
AND INDEX_NAME = 'idx_biz_file_task_status_module_created'
);
SET @sql := IF(@idx_exists = 0,
'ALTER TABLE biz_file_task ADD INDEX idx_biz_file_task_status_module_created (status, module_type, created_at)',
'SELECT 1'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- 2) biz_task_evidence(created_at)
SET @idx_exists := (
SELECT COUNT(*) FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'biz_task_evidence'
AND INDEX_NAME = 'idx_task_evidence_created_at'
);
SET @sql := IF(@idx_exists = 0,
'ALTER TABLE biz_task_evidence ADD INDEX idx_task_evidence_created_at (created_at)',
'SELECT 1'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
@@ -0,0 +1,15 @@
-- 迁移 V185:后台菜单「任务证据」(v1.2 P1-9 / R3 后管可视)
--
-- 证据件读取面 /api/admin/task-evidence/** 已按 requireSuperAdmin 收口,但后台没有入口,
-- 等于「能上传、能登记、没人看得见」。这里只新增一条菜单行,挂在「记录与版本」分组下,
-- 幂等插入:column_key 已存在时不再写第二行。
--
-- 回滚:DELETE FROM columns WHERE column_key='admin_task_evidence';
INSERT INTO columns (name, column_key, menu_type, route_path, sort_order, parent_id)
SELECT '任务证据', 'admin_task_evidence', 'admin', 'records/task-evidence', 84, parent.id
FROM columns parent
WHERE parent.column_key = 'admin_group_record'
AND NOT EXISTS (
SELECT 1 FROM columns WHERE column_key = 'admin_task_evidence'
);
@@ -11,4 +11,48 @@
ORDER BY id ASC
LIMIT #{batchSize}
</select>
<!-- 这一单的执行通道,SQL 侧的 CollectChannel.resolve:登记过就按登记的算,
没登记(NULL)或存了不可识别值的按模块默认兜(localDefaultModules 由
CollectChannel.localDefaultModuleTypes() 传进来,两边共用一处真源)。
写成 CASE 而不是 collect_channel = 'LOCAL' OR …:后者在列为 NULL 时整个谓词吃三值逻辑
变成 UNKNOWN,NOT 之后仍不成立,会被默认兜成 ONLINE 的模块(COLLECT_DATA 等)就此领不到。 -->
<sql id="resolvedChannelCase">
CASE
WHEN collect_channel IN ('LOCAL', 'ONLINE') THEN collect_channel
WHEN module_type IN
<foreach collection="localDefaultModules" item="localDefaultModule" open="(" separator="," close=")">#{localDefaultModule}</foreach>
THEN 'LOCAL'
ELSE 'ONLINE'
END
</sql>
<!-- 客户端兜底拉取候选(P1-1):通道谓词与 status/模块/时间窗口同在 WHERE 里,LIMIT 之后不再有 Java 过滤。 -->
<select id="selectLocalChannelPendingTasks"
resultType="com.nanri.aiimage.modules.task.model.entity.FileTaskEntity">
SELECT id, module_type, collect_channel, created_at
FROM biz_file_task
WHERE user_id = #{userId}
AND status = #{status}
AND module_type IN
<foreach collection="moduleTypes" item="module" open="(" separator="," close=")">#{module}</foreach>
AND created_at &lt; #{cutoff}
AND <include refid="resolvedChannelCase"/> = 'LOCAL'
ORDER BY created_at ASC
LIMIT #{limit}
</select>
<!-- 服务端内部认领候选(P1-1 同形状):本机通道的单要让位给本地客户端,等满兜底窗口才接管。 -->
<select id="selectInternalClaimCandidates"
resultType="com.nanri.aiimage.modules.task.model.entity.FileTaskEntity">
SELECT id, module_type, collect_channel, created_at
FROM biz_file_task
WHERE status = #{status}
AND module_type IN
<foreach collection="moduleTypes" item="module" open="(" separator="," close=")">#{module}</foreach>
AND created_at &lt; #{cutoff}
AND (NOT (<include refid="resolvedChannelCase"/> = 'LOCAL') OR created_at &lt;= #{localCutoff})
ORDER BY created_at ASC
LIMIT #{limit}
</select>
</mapper>