功能:CameraNameService 优先使用 cameraName 字段显示摄像头名称

format_display_name 优先取 camera_name(用户自定义),
没有则降级到原有的 gbName/app 提取逻辑。
This commit is contained in:
2026-03-19 11:35:23 +08:00
parent 03082a5934
commit 26ae14f37c

View File

@@ -200,7 +200,12 @@ class CameraNameService:
if not camera_info: if not camera_info:
return device_id 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") camera_code = camera_info.get("cameraCode") or camera_info.get("camera_code")
stream = camera_info.get("stream") stream = camera_info.get("stream")
name = self.extract_name(camera_info) name = self.extract_name(camera_info)