Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-26 09:03:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3199 from xinnan-tech/py-device-calling

Browse Source 
update:如果通讯权限 alias 为空，就用默认使用设备名称
This commit is contained in:
欣南科技
2026-06-01 23:53:29 +08:00
committed by GitHub
parent 941aaf10ce a0181cc723
commit f42088eff4
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java
+2 -1
View File
@@ -45,7 +45,8 @@ public class DeviceController {
private final RedisUtils redisUtils; private final RedisUtils redisUtils;
private final SysParamsService sysParamsService; 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.deviceService = deviceService;
this.deviceAddressBookService = deviceAddressBookService; this.deviceAddressBookService = deviceAddressBookService;
this.redisUtils = redisUtils; this.redisUtils = redisUtils;
main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceAddressBookServiceImpl.java
+10 -1
View File
@@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.dao.DeviceAddressBookDao;
import xiaozhi.modules.device.entity.DeviceAddressBookEntity; import xiaozhi.modules.device.entity.DeviceAddressBookEntity;
import xiaozhi.modules.device.service.DeviceAddressBookService; import xiaozhi.modules.device.service.DeviceAddressBookService;
import xiaozhi.modules.device.service.DeviceService;
@Service @Service
public class DeviceAddressBookServiceImpl implements DeviceAddressBookService { public class DeviceAddressBookServiceImpl implements DeviceAddressBookService {
private final DeviceAddressBookDao deviceAddressBookDao; private final DeviceAddressBookDao deviceAddressBookDao;
private final RedisUtils redisUtils; 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.deviceAddressBookDao = deviceAddressBookDao;
this.redisUtils = redisUtils; this.redisUtils = redisUtils;
this.deviceService = deviceService;
} }
@Override @Override
@@ -131,6 +136,10 @@ public class DeviceAddressBookServiceImpl implements DeviceAddressBookService {
DeviceAddressBookEntity entity = new DeviceAddressBookEntity(); DeviceAddressBookEntity entity = new DeviceAddressBookEntity();
entity.setMacAddress(macAddress); entity.setMacAddress(macAddress);
entity.setTargetMac(targetMac); entity.setTargetMac(targetMac);
// 如果 alias 为空，就用默认使用设备名称
if (StringUtils.isBlank(alias)) {
alias = deviceService.getDeviceByMacAddress(targetMac).getAlias();
}
entity.setAlias(alias); entity.setAlias(alias);
entity.setHasPermission(hasPermission); entity.setHasPermission(hasPermission);
deviceAddressBookDao.insert(entity); deviceAddressBookDao.insert(entity);