From f6bc60f0c2cc6aaa44f7daa8f4a1179404b7e812 Mon Sep 17 00:00:00 2001
From: YangCheng <1633794139@qq.com>
Date: Fri, 20 Mar 2026 22:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4=E5=90=8D=E7=A7=B0=E6=8E=A8=E9=80=81=E6=97=B6gbName?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=B6=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80=E5=88=B0cameraId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/aiot/service/impl/AiConfigServiceImpl.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiConfigServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiConfigServiceImpl.java
index daf88d217..b8114ea76 100644
--- a/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiConfigServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiConfigServiceImpl.java
@@ -357,7 +357,11 @@ public class AiConfigServiceImpl implements IAiConfigService {
                 camOut.put("camera_id", cameraId);
                 camOut.put("enabled", true);
                 camOut.put("rtsp_url", proxy.getSrcUrl());
-                camOut.put("camera_name", proxy.getGbName() != null ? proxy.getGbName() : cameraId);
+                String cameraName = proxy.getGbName();
+                if (cameraName == null || cameraName.isBlank()) {
+                    cameraName = cameraId;
+                }
+                camOut.put("camera_name", cameraName);
                 cameraList.add(camOut);
                 validCameraIds.add(cameraId);
                 log.debug("[AiConfig] 添加摄像头: cameraCode={}, srcUrl={}", cameraId, proxy.getSrcUrl());