|
|
@ -78,8 +78,10 @@ async function getCameraProject (ctx, next) { |
|
|
|
findOption.where.externalDomain = externalDomain |
|
|
|
} |
|
|
|
if (serialNo) { |
|
|
|
findOption.where.serialNo = { $in: serialNo.split(',') } |
|
|
|
findOption.where.topSerialNo = { $in: serialNo.split(',') } |
|
|
|
findOption.where['$or'] = { |
|
|
|
serialNo: { $in: serialNo.split(',') }, |
|
|
|
topSerialNo: { $in: serialNo.split(',') } |
|
|
|
} |
|
|
|
} |
|
|
|
if (state) { |
|
|
|
if (state == 'DISABLED') { |
|
|
@ -150,7 +152,7 @@ async function getCameraProject (ctx, next) { |
|
|
|
|
|
|
|
// if (camera.type != 'yingshi') {
|
|
|
|
// const playUrl = await getPlayUrl({ topSerialNo: camera.topSerialNo, serialNo: camera.serialNo })
|
|
|
|
// camera.gbCamera.dataValues.playUrl = playUrl
|
|
|
|
// camera.gbCamera.dataValues.playUrl = playUrl
|
|
|
|
// }
|
|
|
|
} |
|
|
|
|
|
|
|