修复:企微推送摄像头编码自动解析显示名称
This commit is contained in:
@@ -116,11 +116,16 @@ async def send_card(request: Request):
|
|||||||
if alarm:
|
if alarm:
|
||||||
alarm_type_code = alarm.alarm_type or ""
|
alarm_type_code = alarm.alarm_type or ""
|
||||||
alarm_snapshot_key = alarm.snapshot_url or ""
|
alarm_snapshot_key = alarm.snapshot_url or ""
|
||||||
if not camera_name or camera_name == "未知":
|
camera_name_needs_resolve = (
|
||||||
if alarm.device_id:
|
not camera_name
|
||||||
camera_service = get_camera_name_service()
|
or camera_name == "未知"
|
||||||
camera_info = await camera_service.get_camera_info(alarm.device_id)
|
or camera_name == (alarm.device_id or "")
|
||||||
camera_name = camera_service.format_display_name(alarm.device_id, camera_info)
|
or camera_name.lower().startswith("cam_")
|
||||||
|
)
|
||||||
|
if camera_name_needs_resolve and alarm.device_id:
|
||||||
|
camera_service = get_camera_name_service()
|
||||||
|
camera_info = await camera_service.get_camera_info(alarm.device_id)
|
||||||
|
camera_name = camera_service.format_display_name(alarm.device_id, camera_info)
|
||||||
finally:
|
finally:
|
||||||
db.close()
|
db.close()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user