From 6d0054c2b177406da5fc1d2c85735151406f92bb Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Sat, 8 Oct 2022 16:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A4=E7=9F=B3=E5=91=8A=E8=AD=A6=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E8=90=A4=E7=9F=B3token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/alarm/video.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/api/app/lib/controllers/alarm/video.js b/api/app/lib/controllers/alarm/video.js
index 6a2a2dd..1c782bc 100644
--- a/api/app/lib/controllers/alarm/video.js
+++ b/api/app/lib/controllers/alarm/video.js
@@ -89,6 +89,7 @@ async function alarmList (ctx) {
                camera_status.describe AS statusDescribe,
                camera_status_resolve.resolve AS resolve,
                "gbCamera".online AS cameraOnline,
+               secret_yingshi.token AS yingshiToken,
                   anxinIpc.t_video_ipc.name AS anxinIpcPosition,
                   anxinStation.id AS anxinStationId,
                   anxinStation.name AS anxinStationName,
@@ -102,6 +103,7 @@ async function alarmList (ctx) {
                         camera.name AS cameraName,
                         camera.kind_id AS cameraKindId,
                         camera.vender_id AS venderId,
+                        camera.yingshi_secret_id AS yingshiSecretId,
                         vender.name AS venderName,
                         camera_status_alarm.id AS alarmId,
                         camera_status_alarm.create_time AS createTime,
@@ -112,9 +114,9 @@ async function alarmList (ctx) {
                         camera_status_alarm.channel_no AS cameraChannelNo,
                         camera_status_alarm.confirm AS confirmContent,
                         ${
-                           //' 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
@@ -147,6 +149,8 @@ async function alarmList (ctx) {
                ON camera_status_resolve.status_id = camera_status.id
             LEFT JOIN "gbCamera"
                ON "gbCamera".id = cameraAlarm.gbId
+            LEFT JOIN "secret_yingshi"
+               ON "secret_yingshi".id = cameraAlarm.yingshiSecretId
 
             LEFT JOIN ${anxinyun}.t_video_ipc AS anxinIpc
                ON toString(anxinIpc.channel_no) = cameraAlarm.cameraChannelNo
@@ -192,6 +196,7 @@ async function alarmList (ctx) {
                camerOnline: a.cameraOnline,
                cameraSerialNo: a.cameraSerialNo,
                cameraChannelNo: a.cameraChannelNo,
+               autoRestore: a.autoRestore,
                createTime: a.createTime,
                updateTime: a.updateTime,
                platform: a.platform,
@@ -203,6 +208,7 @@ async function alarmList (ctx) {
                venderId: a.venderId,
                venderName: a.venderName,
                cameraKindId: a.cameraKindId,
+               yingshiToken: a.yingshiToken,
 
                resolve: [],
                struc: [],