From d625195755c91467ec7b6c841f96116f9c84d2b8 Mon Sep 17 00:00:00 2001
From: weiyachao <13526234727@126.com>
Date: Mon, 9 Oct 2023 14:08:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/qiuguo/iot/third/service/MusicService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/MusicService.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/MusicService.java
index 4b40846..ba7473c 100644
--- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/MusicService.java
+++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/MusicService.java
@@ -58,6 +58,7 @@ public class MusicService {
                 .defaultHeader("Accept-Encoding", "gzip, deflate, br")
                 .defaultHeader("Connection", "keep-alive")
                 .defaultHeader("Accept", "*")
+                .defaultHeader("music-key", "qiuguo")
                 .build();
         String baseUrl = "http://121.40.172.241:8031";
         if (type == 1) {

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 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=99=E8=96=B0?=
 =?UTF-8?q?=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);

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

---
 .../com/qiuguo/iot/third/service/TuyaDeviceService.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 9424fb3..9521dcb 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
@@ -1,6 +1,7 @@
 package com.qiuguo.iot.third.service;
 
 import cn.hutool.log.Log;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.qiuguo.iot.data.entity.user.UserHandlingDeviceEntity;
@@ -190,7 +191,8 @@ public class TuyaDeviceService {
                 int intValue = (int) value;
                 jsonObject.put("value", intValue <= min ? min + 1 : intValue);
             }
-            if (javaList.contains(jsonObject)&&!Objects.equals(deviceInfo.getString("category"),"xxj")) {
+            boolean categoryBoolean = Objects.equals(deviceInfo.getString("category"), "xxj");
+            if (javaList.contains(jsonObject)&&!categoryBoolean) {
                 tuyaResponse.setMessage("已在当前状态");
                 tuyaResponse.setCode(200);
                 return Mono.just(tuyaResponse);
@@ -199,7 +201,7 @@ public class TuyaDeviceService {
             List<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.toList());
-            commands.put("commands", collect);
+            commands.put("commands", categoryBoolean ? Arrays.asList(jsonObject) : collect);
             Boolean result = tuyaDeviceConnector.controlDevice(query.getDeviceId(), commands);
             if (result) {
                 tuyaResponse.setMessage("ok");