diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/TuyaDeviceService.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/TuyaDeviceService.java index af4cb8e..46c0c57 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/TuyaDeviceService.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/TuyaDeviceService.java @@ -201,7 +201,14 @@ public class TuyaDeviceService { javaList.add(jsonObject); Set collect = javaList.stream().filter(jl -> !ObjectUtils.isEmpty(jl.get("value"))) .filter(jl -> !jl.getString("value").startsWith("{")) - .filter(jl -> !jl.getString("value").startsWith("[")).collect(Collectors.toSet()); + .filter(jl -> !jl.getString("value").startsWith("[")) + .map(jl->{ + if (jl.getString("code").equalsIgnoreCase(jsonObject.getString("code"))) { + return jsonObject; + } + return jl; + }) + .collect(Collectors.toSet()); if (Objects.equals(deviceInfo.getString("category"), "fs")) { collect.clear(); collect.add(jsonObject);