From 9c762844025ee409b0b5c92985d0864a693c8e65 Mon Sep 17 00:00:00 2001
From: weiyachao <13526234727@126.com>
Date: Mon, 9 Oct 2023 14:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=99=E8=96=B0=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/qiuguo/iot/third/enums/TuyaCategoryEnum.java | 3 +++
 .../java/com/qiuguo/iot/third/service/TuyaDeviceService.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/TuyaCategoryEnum.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/TuyaCategoryEnum.java
index d835450..32c8281 100644
--- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/TuyaCategoryEnum.java
+++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/TuyaCategoryEnum.java
@@ -20,6 +20,9 @@ public enum TuyaCategoryEnum {
     
     SD("sd", "扫地机器人", "power"),
     
+    DD("dd", "灯带", "switch_led"),
+    
+    XXJ("xxj", "香薰机", "switch"),
     
     ;
     
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 01f96de..9424fb3 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
@@ -190,7 +190,7 @@ public class TuyaDeviceService {
                 int intValue = (int) value;
                 jsonObject.put("value", intValue <= min ? min + 1 : intValue);
             }
-            if (javaList.contains(jsonObject)) {
+            if (javaList.contains(jsonObject)&&!Objects.equals(deviceInfo.getString("category"),"xxj")) {
                 tuyaResponse.setMessage("已在当前状态");
                 tuyaResponse.setCode(200);
                 return Mono.just(tuyaResponse);