fix: literals.now 在 egg-mysql 5 中已移除,改为原生 SQL NOW() 修复 taskComplete 回写挂起

This commit is contained in:
liufumingren 2026-08-23 18:09:51 +08:00
parent 9626ba78e0
commit 99091ac22d

View File

@ -276,20 +276,23 @@ class HikvisionService extends BaseService {
const existingVideo = await app.mysql.get('wms').get(videoTable, whereCond);
if (!existingVideo) {
const insertRow = {
[fkColumn]: taskIdNum,
video_url: '',
status: 'recording',
remark: message || '任务已接收',
created_at: app.mysql.literals.now,
updated_at: app.mysql.literals.now,
};
if (!isNaN(cameraIdNum)) insertRow.camera_id = cameraIdNum;
await app.mysql.get('wms').insert(videoTable, insertRow);
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())`,
[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())`,
[taskIdNum, message || '任务已接收']
);
}
} else if (existingVideo.status === 'created') {
await app.mysql.get('wms').update(videoTable,
{ status: 'recording', remark: message || '任务已接收', updated_at: app.mysql.literals.now },
{ where: { id: existingVideo.id } }
await app.mysql.get('wms').query(
`UPDATE ${videoTable} SET status = 'recording', remark = ?, updated_at = NOW() WHERE id = ?`,
[message || '任务已接收', existingVideo.id]
);
}
@ -351,14 +354,10 @@ class HikvisionService extends BaseService {
limit: 1,
});
if (latestVideo) {
await app.mysql.get('wms').update(videoTable,
{
video_url: fileUrl || output || '',
status: 'completed',
remark: `大小:${(size / 1024 / 1024).toFixed(2)}MB, 时长:${duration}s, 倍速:${speed}x`,
updated_at: app.mysql.literals.now,
},
{ where: { id: latestVideo.id } }
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 = ?`,
[fileUrl || output || '', remarkText, latestVideo.id]
);
}
@ -373,9 +372,9 @@ class HikvisionService extends BaseService {
limit: 1,
});
if (latestVideo) {
await app.mysql.get('wms').update(videoTable,
{ status: 'failed', remark: errorMsg || '录像失败', updated_at: app.mysql.literals.now },
{ where: { id: latestVideo.id } }
await app.mysql.get('wms').query(
`UPDATE ${videoTable} SET status = 'failed', remark = ?, updated_at = NOW() WHERE id = ?`,
[errorMsg || '录像失败', latestVideo.id]
);
}
@ -475,14 +474,11 @@ class HikvisionService extends BaseService {
const matchedServer = servers.find(s => s.id === matchedCamera.server_id) || servers[0];
if (!matchedServer) continue;
await app.mysql.get('wms').insert(cfg.videoTable, {
[cfg.fkColumn]: task.id,
camera_id: matchedCamera.id,
video_url: '',
status: 'created',
created_at: app.mysql.literals.now,
updated_at: app.mysql.literals.now,
});
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())`,
[task.id, matchedCamera.id]
);
pushedItems.push({ cameraId, matchedCamera, matchedServer });
}
console.log(`[Hikvision] 强制录制-重置录像行: ${cfg.fkColumn}=${task.id}`);