|
|
@ -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) { |
|
|
|