浏览代码

优化导出

zhou-hao 5 年之前
父节点
当前提交
997f6e1579

+ 2 - 4
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/LocalDeviceInstanceService.java

@@ -459,10 +459,8 @@ public class LocalDeviceInstanceService extends GenericReactiveCrudService<Devic
                 };
                 ExcelWriter excelWriter = EasyExcel.write(outputStream, DeviceInstanceImportExportEntity.class).build();
                 WriteSheet writeSheet = EasyExcel.writerSheet().build();
-                sink.onCancel(query(queryParam)
-                    .map(entity -> {
-                        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())