From a0181cc723f30d0b01cf1be895b9264a89ee7a5d Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Mon, 1 Jun 2026 23:52:38 +0800
Subject: [PATCH] =?UTF-8?q?update:=E5=A6=82=E6=9E=9C=E9=80=9A=E8=AE=AF?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=20alias=20=E4=B8=BA=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=B1=E7=94=A8=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/device/controller/DeviceController.java   |  3 ++-
 .../service/impl/DeviceAddressBookServiceImpl.java    | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java b/main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java
index 748293c6..6f5a1f99 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java
@@ -45,7 +45,8 @@ public class DeviceController {
     private final RedisUtils redisUtils;
     private final SysParamsService sysParamsService;
 
-    public DeviceController(DeviceService deviceService, DeviceAddressBookService deviceAddressBookService, RedisUtils redisUtils, SysParamsService sysParamsService) {
+    public DeviceController(DeviceService deviceService, DeviceAddressBookService deviceAddressBookService,
+            RedisUtils redisUtils, SysParamsService sysParamsService) {
         this.deviceService = deviceService;
         this.deviceAddressBookService = deviceAddressBookService;
         this.redisUtils = redisUtils;
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceAddressBookServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceAddressBookServiceImpl.java
index 7b6e3e8b..4f663897 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceAddressBookServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceAddressBookServiceImpl.java
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,16 +14,20 @@ import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.modules.device.dao.DeviceAddressBookDao;
 import xiaozhi.modules.device.entity.DeviceAddressBookEntity;
 import xiaozhi.modules.device.service.DeviceAddressBookService;
+import xiaozhi.modules.device.service.DeviceService;
 
 @Service
 public class DeviceAddressBookServiceImpl implements DeviceAddressBookService {
 
     private final DeviceAddressBookDao deviceAddressBookDao;
     private final RedisUtils redisUtils;
+    private final DeviceService deviceService;
 
-    public DeviceAddressBookServiceImpl(DeviceAddressBookDao deviceAddressBookDao, RedisUtils redisUtils) {
+    public DeviceAddressBookServiceImpl(DeviceAddressBookDao deviceAddressBookDao, RedisUtils redisUtils,
+            DeviceService deviceService) {
         this.deviceAddressBookDao = deviceAddressBookDao;
         this.redisUtils = redisUtils;
+        this.deviceService = deviceService;
     }
 
     @Override
@@ -131,6 +136,10 @@ public class DeviceAddressBookServiceImpl implements DeviceAddressBookService {
             DeviceAddressBookEntity entity = new DeviceAddressBookEntity();
             entity.setMacAddress(macAddress);
             entity.setTargetMac(targetMac);
+            // 如果 alias 为空，就用默认使用设备名称
+            if (StringUtils.isBlank(alias)) {
+                alias = deviceService.getDeviceByMacAddress(targetMac).getAlias();
+            }
             entity.setAlias(alias);
             entity.setHasPermission(hasPermission);
             deviceAddressBookDao.insert(entity);