From 87ac18a53fe9c3a07fd2fe1c86d9c0ab2a1cf264 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 16 Mar 2020 16:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AE=BE=E5=A4=87=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/device/web/DeviceInstanceController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java index 21c5c17b..4c50caec 100644 --- a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java +++ b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java @@ -258,7 +258,9 @@ public class DeviceInstanceController implements .buffer(20) .publishOn(Schedulers.single()) .concatMap(list -> service.save(Flux.fromIterable(list))) - .map(ImportDeviceInstanceResult::success)); + .map(ImportDeviceInstanceResult::success)) + .onErrorResume(err -> Mono.just(ImportDeviceInstanceResult.error(err))) + ; } DataBufferFactory bufferFactory = new DefaultDataBufferFactory();