From 040359177efb79bec93c30033f1965423fd5009e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Sat, 17 Jan 2026 16:08:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/device/domain/api/IThingsBoardDomain.java | 1 + .../com/ruoyi/device/domain/impl/ThingsBoardDomainImpl.java | 1 + src/main/java/com/ruoyi/device/service/impl/SynService.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ruoyi/device/domain/api/IThingsBoardDomain.java b/src/main/java/com/ruoyi/device/domain/api/IThingsBoardDomain.java index c55d119..2c5903d 100644 --- a/src/main/java/com/ruoyi/device/domain/api/IThingsBoardDomain.java +++ b/src/main/java/com/ruoyi/device/domain/api/IThingsBoardDomain.java @@ -80,6 +80,7 @@ public interface IThingsBoardDomain { * @param deviceId 设备ID * @return 网关设备ID，如果设备不属于任何网关则返回 null */ + @Deprecated String getDeviceGatewayId(String deviceId); /** diff --git a/src/main/java/com/ruoyi/device/domain/impl/ThingsBoardDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/ThingsBoardDomainImpl.java index 9f34f6b..50349d3 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/ThingsBoardDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/ThingsBoardDomainImpl.java @@ -212,6 +212,7 @@ public class ThingsBoardDomainImpl implements IThingsBoardDomain { } @Override + @Deprecated public String getDeviceGatewayId(String deviceId) { try { DeviceId id = new DeviceId(UUID.fromString(deviceId)); diff --git a/src/main/java/com/ruoyi/device/service/impl/SynService.java b/src/main/java/com/ruoyi/device/service/impl/SynService.java index 7668355..ea7d0e3 100644 --- a/src/main/java/com/ruoyi/device/service/impl/SynService.java +++ b/src/main/java/com/ruoyi/device/service/impl/SynService.java @@ -227,7 +227,7 @@ public class SynService { try { // 获取子设备属性 - AttributeMap attributes = iThingsBoardDomain.getDeviceAttributes(childDeviceId); + AttributeMap attributes = iThingsBoardDomain.getPredefinedDeviceAttributes(childDeviceId); // 判断设备类型 DeviceType deviceType = determineDeviceType(childDeviceInfo, attributes);