From b5db6fe186cc491650711d8cdbaf6652d0a4cac4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 十二月 2021 15:57:11 +0800
Subject: [PATCH] update 重构分页工具 使用分页实体类 过期方法标注过期 3.6.0 移除
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index d2ccd56..6c5dc5f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -5,6 +5,7 @@
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.ruoyi.common.convert.ExcelBigNumberConvert;
import com.ruoyi.common.excel.DefaultExcelListener;
+import com.ruoyi.common.excel.ExcelListener;
import com.ruoyi.common.excel.ExcelResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils;
@@ -23,7 +24,7 @@
public class ExcelUtil {
/**
- * 鍚屾瀵煎叆
+ * 鍚屾瀵煎叆(閫傜敤浜庡皬鏁版嵁閲�)
*
* @param is 杈撳叆娴�
* @return 杞崲鍚庨泦鍚�
@@ -34,11 +35,11 @@
/**
- * 浣跨敤鏍￠獙鐩戝惉鍣ㄥ鐞嗗鍏�
+ * 浣跨敤鏍￠獙鐩戝惉鍣� 寮傛瀵煎叆 鍚屾杩斿洖
*
- * @param is 杈撳叆娴�
- * @param clazz 瀵硅薄绫诲瀷
- * @param isValidate 鏄惁 Validator 妫�楠� 榛樿涓烘槸
+ * @param is 杈撳叆娴�
+ * @param clazz 瀵硅薄绫诲瀷
+ * @param isValidate 鏄惁 Validator 妫�楠� 榛樿涓烘槸
* @return 杞崲鍚庨泦鍚�
*/
public static <T> ExcelResult<T> importExcel(InputStream is, Class<T> clazz, boolean isValidate) {
@@ -48,16 +49,16 @@
}
/**
- * 浣跨敤鑷畾涔夌洃鍚櫒瀵煎叆
+ * 浣跨敤鑷畾涔夌洃鍚櫒 寮傛瀵煎叆 鑷畾涔夎繑鍥�
*
- * @param is 杈撳叆娴�
- * @param clazz 瀵硅薄绫诲瀷
- * @param readListener 鑷畾涔夌洃鍚櫒
+ * @param is 杈撳叆娴�
+ * @param clazz 瀵硅薄绫诲瀷
+ * @param listener 鑷畾涔夌洃鍚櫒
* @return 杞崲鍚庨泦鍚�
*/
- public static <T> ExcelResult<T> importExcel(InputStream is, Class<T> clazz, DefaultExcelListener<T> readListener) {
- EasyExcel.read(is, clazz, readListener).sheet().doRead();
- return readListener.getExcelResult();
+ public static <T> ExcelResult<T> importExcel(InputStream is, Class<T> clazz, ExcelListener<T> listener) {
+ EasyExcel.read(is, clazz, listener).sheet().doRead();
+ return listener.getExcelResult();
}
/**
--
Gitblit v1.9.3