Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
This commit is contained in:
commit
7aef742387
@ -163,6 +163,7 @@ public class TuyaDeviceService {
|
|||||||
List<JSONObject> javaList = deviceStatus.toJavaList(JSONObject.class);
|
List<JSONObject> javaList = deviceStatus.toJavaList(JSONObject.class);
|
||||||
if (javaList.contains(jsonObject)) {
|
if (javaList.contains(jsonObject)) {
|
||||||
tuyaResponse.setMessage("已在当前状态");
|
tuyaResponse.setMessage("已在当前状态");
|
||||||
|
tuyaResponse.setCode(200);
|
||||||
return Mono.just(tuyaResponse);
|
return Mono.just(tuyaResponse);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -174,6 +175,9 @@ public class TuyaDeviceService {
|
|||||||
tuyaResponse.setMessage("请求失败");
|
tuyaResponse.setMessage("请求失败");
|
||||||
}
|
}
|
||||||
return Mono.just(tuyaResponse);
|
return Mono.just(tuyaResponse);
|
||||||
|
}).onErrorResume(ex->{
|
||||||
|
tuyaResponse.setMessage("设备不支持此操作");
|
||||||
|
return Mono.just(tuyaResponse);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user