From 693a33f660891c98b8b95490d020c428c5da9871 Mon Sep 17 00:00:00 2001
From: 抓蛙师 <770492966@qq.com>
Date: 星期一, 19 九月 2022 21:46:32 +0800
Subject: [PATCH] 完善功能：前端可以配置多排序参数支持依次排序 如：{isAsc:"asc",orderByColumn:"id"} {isAsc:"asc",orderByColumn:"id,createTime"} {isAsc:"asc,desc",orderByColumn:"id,createTime"} 共三种配置方式
---
ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 f626a5e..6cd6d28 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,8 @@
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.StreamUtils;
import com.ruoyi.common.utils.ValidatorUtils;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -14,7 +15,6 @@
import javax.validation.ConstraintViolationException;
import java.util.Map;
import java.util.Set;
-import java.util.stream.Collectors;
/**
* Excel 瀵煎叆鐩戝惉
@@ -69,9 +69,7 @@
if (exception instanceof ConstraintViolationException) {
ConstraintViolationException constraintViolationException = (ConstraintViolationException) exception;
Set<ConstraintViolation<?>> constraintViolations = constraintViolationException.getConstraintViolations();
- String constraintViolationsMsg = constraintViolations.stream()
- .map(ConstraintViolation::getMessage)
- .collect(Collectors.joining(", "));
+ String constraintViolationsMsg = StreamUtils.join(constraintViolations, ConstraintViolation::getMessage, ", ");
errMsg = StrUtil.format("绗瑊}琛屾暟鎹牎楠屽紓甯�: {}", context.readRowHolder().getRowIndex() + 1, constraintViolationsMsg);
if (log.isDebugEnabled()) {
log.error(errMsg);
@@ -84,7 +82,7 @@
@Override
public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
this.headMap = headMap;
- log.debug("瑙ｆ瀽鍒颁竴鏉¤〃澶存暟鎹�: {}", JSON.toJSONString(headMap));
+ log.debug("瑙ｆ瀽鍒颁竴鏉¤〃澶存暟鎹�: {}", JsonUtils.toJsonString(headMap));
}
@Override
--
Gitblit v1.9.3