diff --git a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/LocalDeviceInstanceService.java b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/LocalDeviceInstanceService.java index 2ee36092..d52f5f96 100644 --- a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/LocalDeviceInstanceService.java +++ b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/LocalDeviceInstanceService.java @@ -459,10 +459,8 @@ public class LocalDeviceInstanceService extends GenericReactiveCrudService { - return FastBeanCopier.copy(entity, new DeviceInstanceImportExportEntity()); - }) + sink.onDispose(query(queryParam) + .map(entity -> FastBeanCopier.copy(entity, new DeviceInstanceImportExportEntity())) .buffer(100) .doOnNext(list -> excelWriter.write(list, writeSheet)) .doFinally(s -> excelWriter.finish())