From 1a780fa3d4ae5b246a217bba5453c953d0ca481a Mon Sep 17 00:00:00 2001 From: aeizzz Date: Wed, 14 Dec 2022 13:35:47 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=85=A5excel=20=E6=97=B6=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E6=A0=87=E9=A2=98=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/excel/annotation/RequestExcel.java | 6 ++++++ .../pigx/common/excel/aop/RequestExcelArgumentResolver.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/annotation/RequestExcel.java b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/annotation/RequestExcel.java index 979594891..0df77ffa5 100644 --- a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/annotation/RequestExcel.java +++ b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/annotation/RequestExcel.java @@ -34,4 +34,10 @@ public @interface RequestExcel { */ boolean ignoreEmptyRow() default false; + /** + * 指定读取的标题行 + * @return + */ + int headRowNumber() default 1; + } diff --git a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/RequestExcelArgumentResolver.java b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/RequestExcelArgumentResolver.java index 67eaffdcd..27945e123 100644 --- a/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/RequestExcelArgumentResolver.java +++ b/pigx-common/pigx-common-excel/src/main/java/com/pig4cloud/pigx/common/excel/aop/RequestExcelArgumentResolver.java @@ -74,7 +74,7 @@ public class RequestExcelArgumentResolver implements HandlerMethodArgumentResolv // 这里需要指定读用哪个 class 去读,然后读取第一个 sheet 文件流会自动关闭 EasyExcel.read(inputStream, excelModelClass, readListener).registerConverter(LocalDateStringConverter.INSTANCE) .registerConverter(LocalDateTimeStringConverter.INSTANCE).ignoreEmptyRow(requestExcel.ignoreEmptyRow()) - .sheet().doRead(); + .sheet().headRowNumber(requestExcel.headRowNumber()).doRead(); // 校验失败的数据处理 交给 BindResult WebDataBinder dataBinder = webDataBinderFactory.createBinder(webRequest, readListener.getErrors(), "excel");