From 0c8f727bd89677feb4c08b781af72807f4bd143a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 一月 2022 13:03:42 +0800
Subject: [PATCH] update maven-jar-plugin 3.2.0 => 3.2.2 update maven-war-plugin 3.2.0 => 3.2.2 update maven-compiler-plugin 3.1 => 3.9.0 update hutool 5.7.18 => 5.7.20 update springboot-admin 2.6.0 => 2.6.2 update redisson 3.16.7 => 3.16.8 update qiniu 7.9.0 => 7.9.2 update aliyun 3.13.1 => 3.14.0 update qcloud 5.6.58 => 5.6.68 update minio 8.3.4 => 8.3.5
---
ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java b/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java
index ba4cbf9..9936f67 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java
@@ -5,7 +5,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelAnalysisException;
import com.alibaba.excel.exception.ExcelDataConvertException;
-import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.ValidatorUtils;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -24,12 +24,17 @@
*/
@Slf4j
@NoArgsConstructor
-public class DefaultExcelListener<T> extends AnalysisEventListener<T> {
+public class DefaultExcelListener<T> extends AnalysisEventListener<T> implements ExcelListener<T> {
/**
* 鏄惁Validator妫�楠岋紝榛樿涓烘槸
*/
private Boolean isValidate = Boolean.TRUE;
+
+ /**
+ * excel 琛ㄥご鏁版嵁
+ */
+ private Map<Integer, String> headMap;
/**
* 瀵煎叆鍥炴墽
@@ -52,11 +57,11 @@
String errMsg = null;
if (exception instanceof ExcelDataConvertException) {
// 濡傛灉鏄煇涓�涓崟鍏冩牸鐨勮浆鎹㈠紓甯� 鑳借幏鍙栧埌鍏蜂綋琛屽彿
- // 濡傛灉瑕佽幏鍙栧ご鐨勪俊鎭� 閰嶅悎doAfterAllAnalysedHeadMap浣跨敤
ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException) exception;
- errMsg = StrUtil.format("绗瑊}琛�-绗瑊}鍒楄В鏋愬紓甯�<br/>",
- excelDataConvertException.getRowIndex() + 1,
- excelDataConvertException.getColumnIndex() + 1);
+ Integer rowIndex = excelDataConvertException.getRowIndex();
+ Integer columnIndex = excelDataConvertException.getColumnIndex();
+ errMsg = StrUtil.format("绗瑊}琛�-绗瑊}鍒�-琛ㄥご{}: 瑙ｆ瀽寮傚父<br/>",
+ rowIndex + 1, columnIndex + 1, headMap.get(columnIndex));
if (log.isDebugEnabled()) {
log.error(errMsg);
}
@@ -78,7 +83,8 @@
@Override
public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
- log.debug("瑙ｆ瀽鍒颁竴鏉″ご鏁版嵁: {}", JSON.toJSONString(headMap));
+ this.headMap = headMap;
+ log.debug("瑙ｆ瀽鍒颁竴鏉¤〃澶存暟鎹�: {}", JsonUtils.toJsonString(headMap));
}
@Override
@@ -94,6 +100,7 @@
log.debug("鎵�鏈夋暟鎹В鏋愬畬鎴愶紒");
}
+ @Override
public ExcelResult<T> getExcelResult() {
return excelResult;
}
--
Gitblit v1.9.3