From f05ade2b91ff48dc6bc827620e196ee4e871f949 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Wed, 6 Jul 2022 15:46:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B5=81=20=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E8=8E=B7=E5=8F=96=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/api/.vscode/launch.json | 4 ++-- .../api/app/lib/controllers/camera/create.js | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/VideoAccess-VCMP/api/.vscode/launch.json b/code/VideoAccess-VCMP/api/.vscode/launch.json index 4c543c3..d2b588d 100644 --- a/code/VideoAccess-VCMP/api/.vscode/launch.json +++ b/code/VideoAccess-VCMP/api/.vscode/launch.json @@ -23,8 +23,8 @@ "--godUrl https://restapi.amap.com/v3", "--godKey 21c2d970e1646bb9a795900dd00093ce", "--mqttVideoServer mqtt://10.8.30.71:30883", - // "--iotVideoServerUrl http://221.230.55.27:8081", - "--iotVideoServerUrl http://10.8.30.59:8080", + "--iotVideoServerUrl http://221.230.55.27:8081", + // "--iotVideoServerUrl http://10.8.30.59:8080", "--cameraPlayWsHost ws://221.230.55.27:8081", "--cameraPlayHttpFlvHost http://221.230.55.27:2020", "--cameraPlayHlsHost http://221.230.55.27:8081", diff --git a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/create.js b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/create.js index 54f4254..f6394c9 100644 --- a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/create.js +++ b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/create.js @@ -120,7 +120,11 @@ async function getNvrSteam (ctx) { attributes: ['id', 'name', 'serialNo', 'cloudControl'], where: { nvrId: nvrRes.id - } + }, + include: [{ + model: models.CameraRemark, + attributes: ['remark'] + }], }) const cameraRes = await getGbCameraLevel3ByStreamId({ streamId }) @@ -417,7 +421,11 @@ async function getCascadeSteam (ctx) { attributes: ['id', 'name', 'serialNo'], where: { serialNo: { $in: allStreamid } - } + }, + include: [{ + model: models.CameraRemark, + attributes: ['remark'] + }], }) for (let c of cameraRes) {