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