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 4490924..a38682a 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 @@ -61,7 +61,7 @@ public class TuyaDeviceService { } JSONObject deviceInfo = jsonArray.getJSONObject(0); if (Objects.equals(deviceInfo.getBoolean("is_online"), false) && !Objects.equals(data.getMatchingFields(), - "开关")) { + "开")) { return Mono.just(false); } JSONObject commands = new JSONObject(); @@ -69,7 +69,7 @@ public class TuyaDeviceService { String type = data.getType(); jsonObject.put("code", data.getCode()); if (type.equalsIgnoreCase("boolean")) { - jsonObject.put("value", data.getValue()); + jsonObject.put("value", Boolean.parseBoolean(data.getValue())); } else if (type.equalsIgnoreCase("Integer")) { jsonObject.put("value", Integer.parseInt(data.getValue())); } else if (type.equalsIgnoreCase("Enum")) {