Merge branch 'master_dev' into 20230424

芯火源
2 parents 3aa11a3d 87251f58
Showing 1 changed file with 1 additions and 1 deletions
application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
--- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View file @864570b
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View file @864570b
@@ -367,7 +367,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                 tkDeviceStateLogDTO.setTenantId(tenantId);
                 tkDeviceStateLogDTO.setTbDeviceId(tbDeviceId);
                 tkDeviceStateLogDTO.setStatus(status);
-                tkDeviceStateLogDTO.setDeviceName(deviceDTO.getName());
+                tkDeviceStateLogDTO.setDeviceName(StringUtils.isEmpty(deviceDTO.getAlias())?deviceDTO.getName():deviceDTO.getAlias());
                 tkDeviceStateLogDTO.setDeviceType(deviceDTO.getDeviceType());
                 tkDeviceStateLogDTO.setDeviceProfileName(deviceDTO.getDeviceProfile().getName());
                 tkDeviceStateLogDTO.setOrganizationName(deviceDTO.getOrganizationDTO().getName());