From d0ae71835ca0222a00567e51cc5e32310314b482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Sun, 29 Sep 2024 09:38:37 +0800 Subject: [PATCH] =?UTF-8?q?debug:=E5=8F=8C=E6=A8=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/iot/service/impl/IotConverterImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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;