From bfcd3b9a35b7ac3f6e9d64ff5bf2dccc60cb71e3 Mon Sep 17 00:00:00 2001 From: 16337 <1633794139@qq.com> Date: Fri, 3 Apr 2026 11:26:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BC=81=E5=BE=AE?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=91=84=E5=83=8F=E5=A4=B4=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=A7=A3=E6=9E=90=E6=98=BE=E7=A4=BA=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/routers/wechat_notify_api.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/routers/wechat_notify_api.py b/app/routers/wechat_notify_api.py index e4a546e..9120e6e 100644 --- a/app/routers/wechat_notify_api.py +++ b/app/routers/wechat_notify_api.py @@ -116,11 +116,16 @@ async def send_card(request: Request): if alarm: alarm_type_code = alarm.alarm_type or "" alarm_snapshot_key = alarm.snapshot_url or "" - if not camera_name or camera_name == "未知": - if 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) + camera_name_needs_resolve = ( + not camera_name + or camera_name == "未知" + or camera_name == (alarm.device_id or "") + 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: db.close()