From ca36ce883d5f3a4a5420ea960aca9742c10af326 Mon Sep 17 00:00:00 2001 From: weiyachao <13526234727@126.com> Date: Wed, 27 Sep 2023 11:03:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/qiuguo/iot/third/service/TuyaDeviceService.java | 1 + 1 file changed, 1 insertion(+) 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 b5fe14e..e8bc7c5 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 @@ -163,6 +163,7 @@ public class TuyaDeviceService { List javaList = deviceStatus.toJavaList(JSONObject.class); if (javaList.contains(jsonObject)) { tuyaResponse.setMessage("已在当前状态"); + tuyaResponse.setCode(200); return Mono.just(tuyaResponse); } } From bcecf37822aed890d738aedf069247ca10645163 Mon Sep 17 00:00:00 2001 From: weiyachao <13526234727@126.com> Date: Wed, 27 Sep 2023 15:36:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/qiuguo/iot/third/service/TuyaDeviceService.java | 3 +++ 1 file changed, 3 insertions(+) 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 e8bc7c5..966604d 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 @@ -175,6 +175,9 @@ public class TuyaDeviceService { tuyaResponse.setMessage("请求失败"); } return Mono.just(tuyaResponse); + }).onErrorResume(ex->{ + tuyaResponse.setMessage("设备不支持此操作"); + return Mono.just(tuyaResponse); }); } }