From a2843b599dca4edc4bb72a34ff268c2e1df6c62d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 16 七月 2022 15:44:26 +0800
Subject: [PATCH] !205 StreamUtils优化分组方法返回由HashMap无序转为LinkedHashMap有序 Merge pull request !205 from 抓蛙师/auto-7465549-dev-1657957318499
---
ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
index df1f95a..432ab74 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
@@ -4,8 +4,9 @@
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;
-import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
import com.alibaba.excel.metadata.property.ExcelContentProperty;
import lombok.extern.slf4j.Slf4j;
@@ -20,32 +21,32 @@
@Slf4j
public class ExcelBigNumberConvert implements Converter<Long> {
- @Override
- public Class<Long> supportJavaTypeKey() {
- return Long.class;
- }
+ @Override
+ public Class<Long> supportJavaTypeKey() {
+ return Long.class;
+ }
- @Override
- public CellDataTypeEnum supportExcelTypeKey() {
- return CellDataTypeEnum.STRING;
- }
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
- @Override
- public Long convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
- return Convert.toLong(cellData.getData());
- }
+ @Override
+ public Long convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ return Convert.toLong(cellData.getData());
+ }
- @Override
- public CellData<Object> convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
- if (ObjectUtil.isNotNull(object)) {
- String str = Convert.toStr(object);
- if (str.length() > 15) {
- return new CellData<>(str);
- }
- }
- CellData<Object> cellData = new CellData<>(new BigDecimal(object));
- cellData.setType(CellDataTypeEnum.NUMBER);
- return cellData;
- }
+ @Override
+ public WriteCellData<Object> convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ if (ObjectUtil.isNotNull(object)) {
+ String str = Convert.toStr(object);
+ if (str.length() > 15) {
+ return new WriteCellData<>(str);
+ }
+ }
+ WriteCellData<Object> cellData = new WriteCellData<>(new BigDecimal(object));
+ cellData.setType(CellDataTypeEnum.NUMBER);
+ return cellData;
+ }
}
--
Gitblit v1.9.3