fix: 录像回写统一UTC时间基准并按仓库校验,失败/缺失行均落库
- 原视频表写入时间由 NOW() 改为 UTC_TIMESTAMP()(WMS Sequelize 默认 +00:00,服务器为 CST+8) - 回信先取任务行做仓库归属校验,跨仓或不存在的任务直接拒绝写入 - receiveTask 回 ok=false 时落 status=failed,避免录像行卡在 created - 新增 _findVideoRow:camera_id 未命中且任务仅单行时退化为按任务ID定位(多路不猜) - 新增 _insertVideoResult:录像行缺失时兜底插入结果行,保证 WMS 能收敛状态
This commit is contained in:
parent
9d07a3e24e
commit
afda527deb
@ -69,6 +69,81 @@ class HikvisionService extends BaseService {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验回信电脑与任务是否同仓库(防跨仓误写)
|
||||
* print_computer_info 缺失(客户端未走 auth.getInfo)时只告警不阻断
|
||||
* @param {Object} task 任务行(需含 warehouse_id)
|
||||
* @param {string} method 调用方方法名(日志用)
|
||||
* @returns {{ok: boolean, message?: string}}
|
||||
*/
|
||||
_checkTaskWarehouse(task, method) {
|
||||
const { print_computer_info: info } = this.ctx;
|
||||
const taskWarehouse = task && task.warehouse_id;
|
||||
if (!info || !info.warehouse) {
|
||||
console.warn(`[Hikvision] ${method} 缺少电脑绑定信息,跳过仓库校验: task=${task && task.id}, taskWarehouse=${taskWarehouse}`);
|
||||
return { ok: true };
|
||||
}
|
||||
if (String(info.warehouse) !== String(taskWarehouse)) {
|
||||
console.warn(`[Hikvision] ${method} 仓库不匹配,拒绝写入: 电脑仓库=${info.warehouse}, 任务仓库=${taskWarehouse}, task=${task.id}`);
|
||||
return { ok: false, message: '任务与当前电脑仓库不匹配' };
|
||||
}
|
||||
return { ok: true };
|
||||
}
|
||||
|
||||
/**
|
||||
* 定位录像行:先按 任务ID + 摄像头ID 精准定位(避免多摄像头/forceRecord 并发错位);
|
||||
* 精准定位不到时,仅当该任务只有一行录像行才退化为按任务ID定位(多路场景不猜)
|
||||
* @returns {Promise<Object|null>} 录像行,定位不到返回 null
|
||||
*/
|
||||
async _findVideoRow(videoTable, fkColumn, taskIdNum, cameraIdNum) {
|
||||
const { app } = this;
|
||||
const mysql = app.mysql.get('wms');
|
||||
|
||||
const cond = { [fkColumn]: taskIdNum, deleted_at: null };
|
||||
if (!isNaN(cameraIdNum)) cond.camera_id = cameraIdNum;
|
||||
const [row] = await mysql.select(videoTable, {
|
||||
where: cond,
|
||||
orders: [ [ 'id', 'desc' ] ],
|
||||
limit: 1,
|
||||
});
|
||||
if (row) return row;
|
||||
|
||||
const rows = await mysql.select(videoTable, {
|
||||
where: { [fkColumn]: taskIdNum, deleted_at: null },
|
||||
orders: [ [ 'id', 'desc' ] ],
|
||||
limit: 2,
|
||||
});
|
||||
if (!rows || rows.length === 0) return null;
|
||||
if (rows.length > 1) {
|
||||
console.warn(`[Hikvision] 录像行定位失败且该任务存在多路录像行,跳过更新: ${fkColumn}=${taskIdNum}, camera=${cameraIdNum}`);
|
||||
return null;
|
||||
}
|
||||
console.warn(`[Hikvision] 录像行按 camera_id 未命中,退化为按任务ID更新: ${fkColumn}=${taskIdNum}, camera=${cameraIdNum}, videoId=${rows[0].id}`);
|
||||
return rows[0];
|
||||
}
|
||||
|
||||
/**
|
||||
* 兜底落结果行:录像行缺失时直接插入一行结果,
|
||||
* 保证 WMS 能按原视频表(status / video_url)收敛补录请求状态
|
||||
*/
|
||||
async _insertVideoResult(videoTable, fkColumn, taskIdNum, cameraIdNum, { status, videoUrl = '', remark = null }) {
|
||||
const { app } = this;
|
||||
const cols = [ fkColumn ];
|
||||
const params = [ taskIdNum ];
|
||||
if (!isNaN(cameraIdNum)) {
|
||||
cols.push('camera_id');
|
||||
params.push(cameraIdNum);
|
||||
}
|
||||
cols.push('video_url', 'status', 'remark');
|
||||
params.push(videoUrl, status, remark);
|
||||
|
||||
await app.mysql.get('wms').query(
|
||||
`INSERT INTO ${videoTable} (${cols.join(', ')}, created_at, updated_at)
|
||||
VALUES (${cols.map(() => '?').join(', ')}, UTC_TIMESTAMP(), UTC_TIMESTAMP())`,
|
||||
params
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 组装录像任务落参,并用原子 INSERT 创建录像占位记录(防止并发重复)
|
||||
* 注:不使用显式事务(egg-mysql 5 + mysql2 3.23 的事务 conn.query 存在挂起 bug),
|
||||
@ -112,9 +187,10 @@ class HikvisionService extends BaseService {
|
||||
if (!matchedServer) continue;
|
||||
|
||||
// 原子插入防重:仅当该任务+摄像头没有未删除录像行时插入
|
||||
// 时间统一 UTC_TIMESTAMP():WMS 侧 Sequelize 未配 timezone(默认 +00:00),库内时间为 UTC
|
||||
await app.mysql.get('wms').query(
|
||||
`INSERT INTO ${cfg.videoTable} (${cfg.fkColumn}, camera_id, video_url, status, created_at, updated_at)
|
||||
SELECT ?, ?, '', 'created', NOW(), NOW()
|
||||
SELECT ?, ?, '', 'created', UTC_TIMESTAMP(), UTC_TIMESTAMP()
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM ${cfg.videoTable}
|
||||
@ -269,31 +345,39 @@ class HikvisionService extends BaseService {
|
||||
|
||||
const videoTable = isUnpack ? 'wms_return_unpack_video' : 'wms_pack_task_video';
|
||||
const fkColumn = isUnpack ? 'unpack_id' : 'pack_task_id';
|
||||
const cfg = this._getTaskCfg(isUnpack ? 'unpack' : 'pack');
|
||||
|
||||
// 取任务行:仓库归属校验 + 录像行缺失时兜底落库用
|
||||
const task = await app.mysql.get('wms').get(cfg.taskTable, { id: taskIdNum });
|
||||
if (!task) {
|
||||
return this.errorResponse('hikvision.receiveTask', `任务不存在: ${cfg.taskTable}#${taskIdNum}`);
|
||||
}
|
||||
const whCheck = this._checkTaskWarehouse(task, 'hikvision.receiveTask');
|
||||
if (!whCheck.ok) {
|
||||
return this.errorResponse('hikvision.receiveTask', whCheck.message);
|
||||
}
|
||||
|
||||
if (ok) {
|
||||
// 任务接收成功 → 定位该摄像头录像行,状态改为 recording
|
||||
const whereCond = { [fkColumn]: taskIdNum, deleted_at: null };
|
||||
if (!isNaN(cameraIdNum)) whereCond.camera_id = cameraIdNum;
|
||||
|
||||
const existingVideo = await app.mysql.get('wms').get(videoTable, whereCond);
|
||||
const existingVideo = await this._findVideoRow(videoTable, fkColumn, taskIdNum, cameraIdNum);
|
||||
|
||||
if (!existingVideo) {
|
||||
if (!isNaN(cameraIdNum)) {
|
||||
await app.mysql.get('wms').query(
|
||||
`INSERT INTO ${videoTable} (${fkColumn}, camera_id, video_url, status, remark, created_at, updated_at)
|
||||
VALUES (?, ?, '', 'recording', ?, NOW(), NOW())`,
|
||||
VALUES (?, ?, '', 'recording', ?, UTC_TIMESTAMP(), UTC_TIMESTAMP())`,
|
||||
[taskIdNum, cameraIdNum, message || '任务已接收']
|
||||
);
|
||||
} else {
|
||||
await app.mysql.get('wms').query(
|
||||
`INSERT INTO ${videoTable} (${fkColumn}, video_url, status, remark, created_at, updated_at)
|
||||
VALUES (?, '', 'recording', ?, NOW(), NOW())`,
|
||||
VALUES (?, '', 'recording', ?, UTC_TIMESTAMP(), UTC_TIMESTAMP())`,
|
||||
[taskIdNum, message || '任务已接收']
|
||||
);
|
||||
}
|
||||
} else if (existingVideo.status === 'created') {
|
||||
await app.mysql.get('wms').query(
|
||||
`UPDATE ${videoTable} SET status = 'recording', remark = ?, updated_at = NOW() WHERE id = ?`,
|
||||
`UPDATE ${videoTable} SET status = 'recording', remark = ?, updated_at = UTC_TIMESTAMP() WHERE id = ?`,
|
||||
[message || '任务已接收', existingVideo.id]
|
||||
);
|
||||
}
|
||||
@ -301,8 +385,21 @@ class HikvisionService extends BaseService {
|
||||
console.log(`[Hikvision] 录像开始: ${fkColumn}=${taskIdNum}, taskId=${taskId}`);
|
||||
return this.successResponse('hikvision.receiveTask', { [fkColumn]: taskIdNum, status: 'recording' }, '录像已开始');
|
||||
} else {
|
||||
// 任务接收失败
|
||||
console.log(`[Hikvision] 任务接收失败: ${fkColumn}=${taskIdNum}, message=${message}`);
|
||||
// 任务接收失败(录制电脑拒绝/摄像头连不上)→ 落 failed,
|
||||
// 否则该行停在 created,WMS 既非“录制中”也非“全部失败”,只能等 1 小时超时转人工
|
||||
const failedRow = await this._findVideoRow(videoTable, fkColumn, taskIdNum, cameraIdNum);
|
||||
if (failedRow) {
|
||||
await app.mysql.get('wms').query(
|
||||
`UPDATE ${videoTable} SET status = 'failed', remark = ?, updated_at = UTC_TIMESTAMP() WHERE id = ?`,
|
||||
[message || '任务接收失败', failedRow.id]
|
||||
);
|
||||
} else {
|
||||
await this._insertVideoResult(videoTable, fkColumn, taskIdNum, cameraIdNum, {
|
||||
status: 'failed',
|
||||
remark: message || '任务接收失败',
|
||||
});
|
||||
}
|
||||
console.log(`[Hikvision] 任务接收失败(已落 failed): ${fkColumn}=${taskIdNum}, message=${message}`);
|
||||
return this.errorResponse('hikvision.receiveTask', message || '任务接收失败');
|
||||
}
|
||||
} catch (error) {
|
||||
@ -315,6 +412,8 @@ class HikvisionService extends BaseService {
|
||||
* 客户端回调:录像任务完成
|
||||
* 成功 → 写入 video_url,状态 completed
|
||||
* 失败 → 写入 remark,状态 failed
|
||||
* 注:按对接口径,通知方只写原视频表;wms_video_record_request 由 WMS 全权维护,
|
||||
* WMS 定时任务(settleStatuses)会据此收敛补录请求状态并回信
|
||||
*/
|
||||
async taskComplete(data) {
|
||||
const { app } = this;
|
||||
@ -343,41 +442,54 @@ class HikvisionService extends BaseService {
|
||||
|
||||
const videoTable = isUnpack ? 'wms_return_unpack_video' : 'wms_pack_task_video';
|
||||
const fkColumn = isUnpack ? 'unpack_id' : 'pack_task_id';
|
||||
const cfg = this._getTaskCfg(isUnpack ? 'unpack' : 'pack');
|
||||
|
||||
// 按任务ID+摄像头ID精确定位录像行,避免多摄像头/forceRecord 并发错位
|
||||
const whereCond = { [fkColumn]: taskIdNum, deleted_at: null };
|
||||
if (!isNaN(cameraIdNum)) whereCond.camera_id = cameraIdNum;
|
||||
// 取任务行:仓库归属校验(防跨仓误写)+ 录像行缺失时兜底落库用
|
||||
const task = await app.mysql.get('wms').get(cfg.taskTable, { id: taskIdNum });
|
||||
if (!task) {
|
||||
return this.errorResponse('hikvision.taskComplete', `任务不存在: ${cfg.taskTable}#${taskIdNum}`);
|
||||
}
|
||||
const whCheck = this._checkTaskWarehouse(task, 'hikvision.taskComplete');
|
||||
if (!whCheck.ok) {
|
||||
return this.errorResponse('hikvision.taskComplete', whCheck.message);
|
||||
}
|
||||
|
||||
if (success && status === 'completed') {
|
||||
// 取该摄像头最新的录像记录 ID 精准更新
|
||||
const [latestVideo] = await app.mysql.get('wms').select(videoTable, {
|
||||
where: whereCond,
|
||||
orders: [['id', 'desc']],
|
||||
limit: 1,
|
||||
});
|
||||
// 定位该摄像头录像行(带单路退化兜底)
|
||||
const latestVideo = await this._findVideoRow(videoTable, fkColumn, taskIdNum, cameraIdNum);
|
||||
const remarkText = `大小:${(size / 1024 / 1024).toFixed(2)}MB, 时长:${duration}s, 倍速:${speed}x`;
|
||||
if (latestVideo) {
|
||||
const remarkText = `大小:${(size / 1024 / 1024).toFixed(2)}MB, 时长:${duration}s, 倍速:${speed}x`;
|
||||
await app.mysql.get('wms').query(
|
||||
`UPDATE ${videoTable} SET video_url = ?, status = 'completed', remark = ?, updated_at = NOW() WHERE id = ?`,
|
||||
`UPDATE ${videoTable} SET video_url = ?, status = 'completed', remark = ?, updated_at = UTC_TIMESTAMP() WHERE id = ?`,
|
||||
[fileUrl || output || '', remarkText, latestVideo.id]
|
||||
);
|
||||
} else {
|
||||
// 录像行缺失(如未落库/被删)→ 直接落一行结果,保证 WMS 能收敛状态
|
||||
await this._insertVideoResult(videoTable, fkColumn, taskIdNum, cameraIdNum, {
|
||||
status: 'completed',
|
||||
videoUrl: fileUrl || output || '',
|
||||
remark: remarkText,
|
||||
});
|
||||
console.warn(`[Hikvision] 录像行缺失,已兜底插入 completed 行: ${fkColumn}=${taskIdNum}, camera=${cameraIdNum}`);
|
||||
}
|
||||
|
||||
console.log(`[Hikvision] 录像完成: ${fkColumn}=${taskIdNum}, url=${fileUrl}, size=${size}`);
|
||||
return this.successResponse('hikvision.taskComplete',
|
||||
{ [fkColumn]: taskIdNum, status: 'completed' }, '录像完成');
|
||||
} else {
|
||||
// 录像失败 - 同样按摄像头精准更新最新记录
|
||||
const [latestVideo] = await app.mysql.get('wms').select(videoTable, {
|
||||
where: whereCond,
|
||||
orders: [['id', 'desc']],
|
||||
limit: 1,
|
||||
});
|
||||
// 录像失败 - 同样按摄像头精准定位最新记录
|
||||
const latestVideo = await this._findVideoRow(videoTable, fkColumn, taskIdNum, cameraIdNum);
|
||||
if (latestVideo) {
|
||||
await app.mysql.get('wms').query(
|
||||
`UPDATE ${videoTable} SET status = 'failed', remark = ?, updated_at = NOW() WHERE id = ?`,
|
||||
`UPDATE ${videoTable} SET status = 'failed', remark = ?, updated_at = UTC_TIMESTAMP() WHERE id = ?`,
|
||||
[errorMsg || '录像失败', latestVideo.id]
|
||||
);
|
||||
} else {
|
||||
await this._insertVideoResult(videoTable, fkColumn, taskIdNum, cameraIdNum, {
|
||||
status: 'failed',
|
||||
remark: errorMsg || '录像失败',
|
||||
});
|
||||
console.warn(`[Hikvision] 录像行缺失,已兜底插入 failed 行: ${fkColumn}=${taskIdNum}, camera=${cameraIdNum}`);
|
||||
}
|
||||
|
||||
console.log(`[Hikvision] 录像失败: ${fkColumn}=${taskIdNum}, error=${errorMsg}`);
|
||||
@ -479,7 +591,7 @@ class HikvisionService extends BaseService {
|
||||
|
||||
await app.mysql.get('wms').query(
|
||||
`INSERT INTO ${cfg.videoTable} (${cfg.fkColumn}, camera_id, video_url, status, created_at, updated_at)
|
||||
VALUES (?, ?, '', 'created', NOW(), NOW())`,
|
||||
VALUES (?, ?, '', 'created', UTC_TIMESTAMP(), UTC_TIMESTAMP())`,
|
||||
[task.id, matchedCamera.id]
|
||||
);
|
||||
pushedItems.push({ cameraId, matchedCamera, matchedServer });
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user