From 26ae14f37c4ee46e2a7100e8f1b644a372128f35 Mon Sep 17 00:00:00 2001
From: 16337 <1633794139@qq.com>
Date: Thu, 19 Mar 2026 11:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9ACameraNameService=20?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8=20cameraName=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=E6=91=84=E5=83=8F=E5=A4=B4=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

format_display_name 优先取 camera_name（用户自定义），
没有则降级到原有的 gbName/app 提取逻辑。
---
 app/services/camera_name_service.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/services/camera_name_service.py b/app/services/camera_name_service.py
index 7c29ec5..9059db9 100644
--- a/app/services/camera_name_service.py
+++ b/app/services/camera_name_service.py
@@ -200,7 +200,12 @@ class CameraNameService:
         if not camera_info:
             return device_id
 
-        # 提取变量
+        # 优先使用 camera_name（用户自定义名称）
+        camera_name = camera_info.get("cameraName") or camera_info.get("camera_name")
+        if camera_name:
+            return camera_name
+
+        # 降级：提取变量
         camera_code = camera_info.get("cameraCode") or camera_info.get("camera_code")
         stream = camera_info.get("stream")
         name = self.extract_name(camera_info)