fix: fetchTasks事务防并发重复录像记录

- SELECT ... FOR UPDATE 锁定行防竞态
- 事务内原子化检查+插入,异常回滚
- 查询条件增加 camera_id 区分同任务不同摄像头
This commit is contained in:
liufumingren 2026-07-31 21:37:33 +08:00
parent a216aad2ce
commit e605bd80e3

View File

@ -82,6 +82,9 @@ class HikvisionService extends BaseService {
deviceIds = []; deviceIds = [];
} }
// 事务:原子化检查+插入,防止并发重复
const conn = await app.mysql.get('wms').beginTransaction();
try {
for (const deviceId of deviceIds) { for (const deviceId of deviceIds) {
// 按设备ID匹配摄像头 // 按设备ID匹配摄像头
const matchedCamera = cameras.find(c => c.id === deviceId) const matchedCamera = cameras.find(c => c.id === deviceId)
@ -93,13 +96,15 @@ class HikvisionService extends BaseService {
const matchedServer = servers.find(s => s.id === matchedCamera.server_id) || servers[0]; const matchedServer = servers.find(s => s.id === matchedCamera.server_id) || servers[0];
if (!matchedServer) continue; if (!matchedServer) continue;
// 先创建录像记录(状态=created),防止重复拉取 // 事务内 SELECT ... FOR UPDATE 锁定检查,防止并发重复
const existingVideo = await app.mysql.get('wms').get('wms_pack_task_video', { const [existing] = await conn.query(
pack_task_id: task.id, `SELECT id FROM wms_pack_task_video
deleted_at: null, WHERE pack_task_id = ? AND camera_id = ? AND deleted_at IS NULL
}); FOR UPDATE`,
if (!existingVideo) { [task.id, matchedCamera.id]
await app.mysql.get('wms').insert('wms_pack_task_video', { );
if (!existing || existing.length === 0) {
await conn.insert('wms_pack_task_video', {
pack_task_id: task.id, pack_task_id: task.id,
camera_id: matchedCamera.id, camera_id: matchedCamera.id,
video_url: '', video_url: '',
@ -140,6 +145,11 @@ class HikvisionService extends BaseService {
}, },
}); });
} }
await conn.commit();
} catch (txError) {
await conn.rollback();
throw txError;
}
} }
console.log(`[Hikvision] 仓库 ${warehouseId} 返回 ${result.length} 个待录像任务`); console.log(`[Hikvision] 仓库 ${warehouseId} 返回 ${result.length} 个待录像任务`);