feat: add excel

excel/src/main/java/com/qwlabs/excel/DataReader.java

@@ -43,7 +43,7 @@ public Listener(Map<String, String> headMapping) {
 
         @Override
         public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
-            this.indexFields.putAll(ExcelHeaders.lookupHeaders(headMap, headMapping));
+            this.indexFields.putAll(ExcelHelper.lookupHeaders(headMap, headMapping));
         }
 
         @Override

excel/src/main/java/com/qwlabs/excel/ExcelHelper.java

@@ -0,0 +1,43 @@
+package com.qwlabs.excel;
+
+import com.google.common.collect.Maps;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiPredicate;
+
+public final class ExcelHelper {
+    private ExcelHelper() {
+    }
+
+    public static Map<Integer, String> cleanup(Map<Integer, String> data) {
+        return cleanup(data, (index, value) -> Objects.nonNull(value));
+    }
+
+    public static Map<Integer, String> cleanup(Map<Integer, String> data,
+                                               BiPredicate<Integer, String> predicate) {
+        Map<Integer, String> cleanup = Maps.newHashMap();
+        Optional.ofNullable(data).orElseGet(Map::of)
+            .forEach((index, value) -> {
+                if (predicate.test(index, value)) {
+                    cleanup.put(index, value);
+                }
+            });
+        return cleanup;
+    }
+
+    public static Map<Integer, String> lookupHeaders(@NotNull Map<Integer, String> headerData,
+                                                     @NotNull Map<String, String> lookups) {
+        Map<Integer, String> headers = Maps.newHashMapWithExpectedSize(headerData.size());
+        cleanup(headerData).forEach((index, title) -> {
+            var newTitle = lookups.get(title);
+            if (Objects.nonNull(newTitle)) {
+                headers.put(index, newTitle);
+            }
+        });
+        headerData.forEach(headers::putIfAbsent);
+        return headers;
+    }
+}

excel/src/main/java/com/qwlabs/excel/SingleRowReader.java

@@ -7,7 +7,6 @@
 
 import java.io.InputStream;
 import java.util.Map;
-import java.util.Optional;
 
 public class SingleRowReader {
     private final InputStream inputStream;
@@ -22,11 +21,12 @@ public Map<Integer, String> read(SheetReadOptions options, int rowIndex) {
         options.config(EasyExcel.read(inputStream, listener))
             .headRowNumber(rowIndex + 1)
             .doRead();
-        return listener.getData();
+        return ExcelHelper.cleanup(listener.getData());
     }
 
     private static final class Listener extends AnalysisEventListener<Map<Integer, String>> {
         private Map<Integer, String> data;
+
         @Override
         public boolean hasNext(AnalysisContext context) {
             return false;
@@ -44,7 +44,6 @@ public void invoke(Map<Integer, String> data, AnalysisContext context) {
 
         @Override
         public void doAfterAllAnalysed(AnalysisContext context) {
-            this.data = Optional.ofNullable(this.data).orElseGet(Map::of);
         }
 
         public Map<Integer, String> getData() {

excel/src/test/java/com/qwlabs/excel/SingleRowReaderTest.java

@@ -32,7 +32,7 @@ void should_read_twice() {
             SheetReadOptions.builder().sheetNo(0).build(),
             1
         );
-        
+
         valid(data1);
         valid(data2);
     }
@@ -46,12 +46,12 @@ private void valid(Map<Integer, String> data) {
         assertThat(data.get(4), is("发动机型号"));
         assertThat(data.get(5), is("发动机序列号"));
         assertThat(data.get(6), is("航站"));
-        assertThat(data.get(7), is("ATA章节"));
-        assertThat(data.get(8), is("故障描述"));
-        assertThat(data.get(9), is("处置措施"));
-        assertThat(data.get(10), is("故障发生时间"));
-        assertThat(data.get(11), is("故障记录时间"));
-        assertThat(data.get(12), is("故障关闭时间"));
+        assertThat(data.get(8), is("ATA章节"));
+        assertThat(data.get(9), is("故障描述"));
+        assertThat(data.get(10), is("处置措施"));
+        assertThat(data.get(11), is("故障发生时间"));
+        assertThat(data.get(12), is("故障记录时间"));
+        assertThat(data.get(13), is("故障关闭时间"));
     }
 
     private InputStream read(String path) {