From 6fceb5f08f4347fcb9e1fa3bf1ac81dfbcb6b486 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Sat, 8 Oct 2022 16:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=81=A2=E5=A4=8D=E7=9A=84=E5=91=8A=E8=AD=A6=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/alarm/video.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/api/app/lib/controllers/alarm/video.js b/api/app/lib/controllers/alarm/video.js index dfec4bb..6a2a2dd 100644 --- a/api/app/lib/controllers/alarm/video.js +++ b/api/app/lib/controllers/alarm/video.js @@ -83,7 +83,8 @@ async function alarmList (ctx) { cameraAlarm.platform AS platform, cameraAlarm.confirmContent AS confirmContent, cameraAlarm.confirmTime AS confirmTime, - cameraAlarm.autoRestore AS autoRestore, + ${//'cameraAlarm.autoRestore AS autoRestore,' + ''} camera_status_resolve.id AS resolveId, camera_status.describe AS statusDescribe, camera_status_resolve.resolve AS resolve, @@ -110,8 +111,12 @@ async function alarmList (ctx) { camera_status_alarm.serial_no AS cameraSerialNo, camera_status_alarm.channel_no AS cameraChannelNo, camera_status_alarm.confirm AS confirmContent, - camera_status_alarm.confirm_time AS confirmTime, - camera_status_alarm.auto_restore AS autoRestore + ${ + //' camera_status_alarm.auto_restore AS autoRestore,' + '' + } + camera_status_alarm.confirm_time AS confirmTime + FROM camera_status_alarm LEFT JOIN camera ON camera.serial_no = camera_status_alarm.serial_no