diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotConverterImpl.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotConverterImpl.java index 2a18e8fd..c28da10e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotConverterImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotConverterImpl.java @@ -34,9 +34,9 @@ public class IotConverterImpl implements IotConverter { List ds2 = data2 == null ? data1.getDatastreams() : data2.getDatastreams(); if (CollectionUtils.isNotEmptyElement(ds1)) { - this.toIotDeviceInfo(ds1, ds2); + return this.toIotDeviceInfo(ds1, ds2); } else if (CollectionUtils.isNotEmptyElement(ds2)) { - this.toIotDeviceInfo(ds2, ds1); + return this.toIotDeviceInfo(ds2, ds1); } return null;