Преглед на файлове

导入设备返回错误信息

zhou-hao преди 5 години
родител
ревизия
87ac18a53f
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceInstanceController.java

+ 3 - 1
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();