优化

Author: zhou-hao

src/main/java/org/hswebframework/reactor/excel/poi/PoiExcelReader.java

@@ -4,6 +4,7 @@
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.hswebframework.reactor.excel.BoundedCell;
 import org.hswebframework.reactor.excel.InSheetCell;
 import org.hswebframework.reactor.excel.ExcelOption;
 import org.hswebframework.reactor.excel.spi.ExcelReader;
@@ -18,7 +19,7 @@ public String[] getSupportFormat() {
     }
 
     @Override
-    public Flux<? extends InSheetCell> read(InputStream inputStream, ExcelOption... options) {
+    public Flux<BoundedCell> read(InputStream inputStream, ExcelOption... options) {
 
         return Flux.create(sink -> {
             try {

src/test/java/org/hswebframework/reactor/excel/poi/PoiExcelWriterTest.java

@@ -12,6 +12,7 @@
 
 import java.io.FileOutputStream;
 import java.util.HashMap;
+import java.util.Map;
 
 class PoiExcelWriterTest {
 
@@ -39,55 +40,49 @@ void testWrite() {
     @Test
     @SneakyThrows
     void testWriteMultiSheet() {
+
+        Flux<Map<String, Object>> dataStream = Flux.range(0, 1000)
+                                                   .map(i -> new HashMap<String, Object>() {{
+                                                       put("id", i);
+                                                       put("name", "test" + i);
+                                                       put("a", null);
+                                                   }});
+
         ReactorExcel
                 .xlsxWriter()
                 .multiSheet()
-                .sheet(sheet -> {
-                    sheet.name("S1")
-                         .header("id", "ID")
-                         .header("name", "姓名")
-                         .rows(Flux.range(0, 1000)
-                                   .map(i -> new HashMap<String, Object>() {{
-                                       put("id", i);
-                                       put("name", "test" + i);
-                                       put("a", null);
-                                   }}));
-                })
-                .sheet(sheet -> {
-                    sheet.name("S2")
-                         .firstRowIndex(1)
-                         .header("id", "ID")
-                         .header("name", "姓名")
-                         .rows(Flux.range(0, 1000)
-                                   .map(i -> new HashMap<String, Object>() {{
-                                       put("id", "s2:" + i);
-                                       put("name", "test:" + i);
-                                       put("a", null);
-                                   }}))
-                         .cell(0, 0, "大标题")
-                         .option(sheet_ -> {
-                             CellStyle style = sheet_.getWorkbook().createCellStyle();
+                .sheet(spec -> spec
+                        .name("S1")
+                        .header("id", "ID")
+                        .header("name", "姓名")
+                        .rows(dataStream))
+                .sheet(spec -> spec
+                        .name("S2")
+                        .firstRowIndex(1)
+                        .header("id", "ID")
+                        .header("name", "姓名")
+                        .rows(dataStream)
+                        .cell(0, 0, "大标题")
+                        .option(sheet -> {
+                            CellStyle style = sheet.getWorkbook().createCellStyle();
 
-                             style.setAlignment(HorizontalAlignment.CENTER);
-                             style.setVerticalAlignment(VerticalAlignment.CENTER);
+                            style.setAlignment(HorizontalAlignment.CENTER);
+                            style.setVerticalAlignment(VerticalAlignment.CENTER);
 
-                             sheet_.createRow(0);
-                             sheet_.addMergedRegion(CellRangeAddress.valueOf("A1:B1"));
-                             sheet_.getRow(0).createCell(0).setCellStyle(style);
+                            sheet.createRow(0);
+                            sheet.addMergedRegion(CellRangeAddress.valueOf("A1:B1"));
+                            sheet.getRow(0).createCell(0).setCellStyle(style);
 
-                         })
-                        ;
-                })
-                .sheet(sheet -> {
-                    sheet.cell(0, 0, "NameA")
-                         .cell(1, 0, "Age")
-                         .cell(0, 1, "Test")
-                         .cell(1, 1, 1)
-                         .option(sheet_ -> {
-                             sheet_.addMergedRegion(CellRangeAddress.valueOf("A3:B3"));
-                             sheet_.addMergedRegion(CellRangeAddress.valueOf("C1:C3"));
-                         });
-                })
+                        }))
+                .sheet(spec -> spec
+                        .cell(0, 0, "NameA")
+                        .cell(1, 0, "Age")
+                        .cell(0, 1, "Test")
+                        .cell(1, 1, 1)
+                        .option(sheet -> {
+                            sheet.addMergedRegion(CellRangeAddress.valueOf("A3:B3"));
+                            sheet.addMergedRegion(CellRangeAddress.valueOf("C1:C3"));
+                        }))
                 .write(new FileOutputStream("./target/test.xlsx"))
                 .as(StepVerifier::create)
                 .expectComplete()