From cc48575963b610fd8839747df06abb2f861021e8 Mon Sep 17 00:00:00 2001
From: weiyachao <13526234727@126.com>
Date: Thu, 19 Oct 2023 11:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=82=E9=B8=AD=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qiuguo/iot/third/service/TuyaDeviceService.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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<JSONObject> 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);