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