msb-public-java
/
RuoYi-Cloud
mirror of https://gitee.com/y_project/RuoYi-Cloud.git
1
0
Code Issues Projects Releases Wiki Activity

Pre Merge pull request !354 from panxiaoyang/changeExcelUtil

Browse Source
pull/354/MERGE
panxiaoyang 2 years ago committed by Gitee
parent f2a587c2f9 b821142387
commit e6850fd3f8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 176 additions and 90 deletions
Show Stats Download Patch File Download Diff File

78
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
Unescape View File

@ -8,8 +8,10 @@ import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date; import java.util.Date;
import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.util.StringUtils;
/** /**
* 时间工具类 * 时间工具类
@ -127,6 +129,82 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
} }
} }
/**
* 日期型字符串转化为日期 格式
*/
public static LocalDate parseLocalDate(Object str)
{
if (str == null)
{
return null;
}
try
{
return toLocalDate(str.toString(), parsePatterns);
}
catch (ParseException e)
{
return null;
}
}
/**
* 日期型字符串转化为日期 格式
*/
public static LocalDateTime parseLocalDateTime(Object str)
{
if (str == null)
{
return null;
}
try
{
return toLocalDateTime(str.toString(), parsePatterns);
}
catch (ParseException e)
{
return null;
}
}
public static LocalDate toLocalDate(String dateTime, String... formats) throws ParseException{
if (StringUtils.isEmpty(dateTime)) {
return null;
}
if (formats == null || formats.length == 0) {
formats = new String[]{"yyyy-MM-dd"};
}
for(String format:formats){
try
{
DateTimeFormatter df = DateTimeFormatter.ofPattern(format);
LocalDate ldt = LocalDate.parse(dateTime, df);
return ldt;
}catch (Exception ignored)
{
}
}
throw new ParseException("转换异常",formats.length);
}
public static LocalDateTime toLocalDateTime(String dateTime, String... formats) throws ParseException{
if (StringUtils.isEmpty(dateTime)) {
return null;
}
if (formats == null || formats.length == 0) {
formats = new String[]{"yyyy-MM-dd HH:mm:ss"};
}
for(String format:formats){
try
{
DateTimeFormatter df = DateTimeFormatter.ofPattern(format);
LocalDateTime ldt = LocalDateTime.parse(dateTime, df);
return ldt;
}catch (Exception ignored)
{
}
}
throw new ParseException("转换异常",formats.length);
}
/** /**
* 获取服务器启动时间 * 获取服务器启动时间
*/ */

150
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
Unescape View File

@ -292,6 +292,21 @@ public class ExcelUtil<T>
return importExcel(StringUtils.EMPTY, is, titleNum); return importExcel(StringUtils.EMPTY, is, titleNum);
} }
/**
* 初始excel值转换为字段的转换器
* @return 值和字段的映射表
*/
public Map<String,String> initValueToFieldConversionMap(Excel attr){
HashMap<String, String> conversionMap = new HashMap<>();
String allList = attr.readConverterExp();
String[] split = allList.split(",");
for (String dictTagItem : split)
{
String[] split1 = dictTagItem.split("=");
conversionMap.put(split1[1], split1[0]);
}
return conversionMap;
}
/** /**
* 对excel表单指定表格索引名转换成list * 对excel表单指定表格索引名转换成list
* *
@ -336,6 +351,8 @@ public class ExcelUtil<T>
// 有数据时才处理 得到类的所有field. // 有数据时才处理 得到类的所有field.
List<Object[]> fields = this.getFields(); List<Object[]> fields = this.getFields();
Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>(); Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
// 定义所有的excel值和java对象的值的转换映射表
Map<String,Map<String,String>> allFieldConversionMap=new HashMap<>();
for (Object[] objects : fields) for (Object[] objects : fields)
{ {
Excel attr = (Excel) objects[1]; Excel attr = (Excel) objects[1];
@ -343,6 +360,11 @@ public class ExcelUtil<T>
if (column != null) if (column != null)
{ {
fieldsMap.put(column, objects); fieldsMap.put(column, objects);
//如果存在解析键值映射,则直接初始化
if(StringUtils.isNotEmpty(attr.readConverterExp())){
Map<String, String> fieldConversionMap = initValueToFieldConversionMap(attr);
allFieldConversionMap.put(attr.name(),fieldConversionMap);
}
} }
} }
for (int i = titleNum + 1; i <= rows; i++) for (int i = titleNum + 1; i <= rows; i++)
@ -417,6 +439,14 @@ public class ExcelUtil<T>
val = DateUtil.getJavaDate((Double) val); val = DateUtil.getJavaDate((Double) val);
} }
} }
else if (LocalDate.class == fieldType)
{
val = DateUtils.parseLocalDate(val);
}
else if (LocalDateTime.class == fieldType)
{
val = DateUtils.parseLocalDateTime(val);
}
else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
{ {
val = Convert.toBool(val, false); val = Convert.toBool(val, false);
@ -428,9 +458,9 @@ public class ExcelUtil<T>
{ {
propertyName = field.getName() + "." + attr.targetAttr(); propertyName = field.getName() + "." + attr.targetAttr();
} }
if (StringUtils.isNotEmpty(attr.readConverterExp())) if (allFieldConversionMap.get(attr.name())!=null)
{ {
val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); val = getConvertValueByExpMap(Convert.toStr(val), attr.separator(), allFieldConversionMap.get(attr.name()));
} }
else if (!attr.handler().equals(ExcelHandlerAdapter.class)) else if (!attr.handler().equals(ExcelHandlerAdapter.class))
{ {
@ -533,7 +563,8 @@ public class ExcelUtil<T>
for (int index = 0; index < sheetNo; index++) for (int index = 0; index < sheetNo; index++)
{ {
createSheet(sheetNo, index); createSheet(sheetNo, index);
//字段转换列表<列下标,<待转值,转换值>>
Map<Integer, Map<String, String>> fieldConversionMap = new HashMap<>();
// 产生一行 // 产生一行
Row row = sheet.createRow(rownum); Row row = sheet.createRow(rownum);
int column = 0; int column = 0;
@ -547,17 +578,17 @@ public class ExcelUtil<T>
for (Field subField : subFields) for (Field subField : subFields)
{ {
Excel subExcel = subField.getAnnotation(Excel.class); Excel subExcel = subField.getAnnotation(Excel.class);
this.createHeadCell(subExcel, row, column++); this.createHeadCellAndInitFieldConversion(subExcel, row, column++,fieldConversionMap);
} }
} }
else else
{ {
this.createHeadCell(excel, row, column++); this.createHeadCellAndInitFieldConversion(excel, row, column++,fieldConversionMap);
} }
} }
if (Type.EXPORT.equals(type)) if (Type.EXPORT.equals(type))
{ {
fillExcelData(index, row); fillExcelData(index, row, fieldConversionMap);
addStatisticsRow(); addStatisticsRow();
} }
} }
@ -568,9 +599,10 @@ public class ExcelUtil<T>
* *
* @param index 序号 * @param index 序号
* @param row 单元格行 * @param row 单元格行
* @param fieldConversionMap 字段转换Map
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void fillExcelData(int index, Row row) public void fillExcelData(int index, Row row, Map<Integer, Map<String, String>> fieldConversionMap)
{ {
int startNo = index * sheetSize; int startNo = index * sheetSize;
int endNo = Math.min(startNo + sheetSize, list.size()); int endNo = Math.min(startNo + sheetSize, list.size());
@ -618,7 +650,7 @@ public class ExcelUtil<T>
{ {
subField.setAccessible(true); subField.setAccessible(true);
Excel attr = subField.getAnnotation(Excel.class); Excel attr = subField.getAnnotation(Excel.class);
this.addCell(attr, row, (T) obj, subField, column + subIndex); this.addCell(attr, row, (T) obj, subField, column + subIndex, fieldConversionMap);
} }
subIndex++; subIndex++;
} }
@ -628,7 +660,7 @@ public class ExcelUtil<T>
} }
else else
{ {
this.addCell(excel, row, vo, field, column++); this.addCell(excel, row, vo, field, column++, fieldConversionMap);
} }
} }
} }
@ -760,9 +792,9 @@ public class ExcelUtil<T>
} }
/** /**
* 创建单元格 * 创建首行单元格,并且初始化字段的转换
*/ */
public Cell createHeadCell(Excel attr, Row row, int column) public Cell createHeadCellAndInitFieldConversion(Excel attr, Row row, int column, Map<Integer, Map<String, String>> fieldConversionMap)
{ {
// 创建列 // 创建列
Cell cell = row.createCell(column); Cell cell = row.createCell(column);
@ -770,6 +802,19 @@ public class ExcelUtil<T>
cell.setCellValue(attr.name()); cell.setCellValue(attr.name());
setDataValidation(attr, row, column); setDataValidation(attr, row, column);
cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()))); cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
//字段转换初始化(通过readConverterExp字符转换)
if (StringUtils.isNotEmpty(attr.readConverterExp()))
{
HashMap<String, String> conversionMap = new HashMap<>();
String allList = attr.readConverterExp();
String[] split = allList.split(",");
for (String dictTagItem : split)
{
String[] split1 = dictTagItem.split("=");
conversionMap.put(split1[0], split1[1]);
}
fieldConversionMap.put(column, conversionMap);
}
if (isSubList()) if (isSubList())
{ {
// 填充默认样式，防止合并单元格样式失效 // 填充默认样式，防止合并单元格样式失效
@ -885,8 +930,15 @@ public class ExcelUtil<T>
/** /**
* 添加单元格 * 添加单元格
* @param attr 当前单元格表注解
* @param row 当前单元格归属行
* @param vo 单元格内容
* @param field 单元格字段
* @param column 单元格的列号
* @param fieldConversionMap 所有单元格的解析值字典
* @return 生成后的单元格
*/ */
public Cell addCell(Excel attr, Row row, T vo, Field field, int column) public Cell addCell(Excel attr, Row row, T vo, Field field, int column,Map<Integer, Map<String, String>> fieldConversionMap)
{ {
Cell cell = null; Cell cell = null;
try try
@ -908,15 +960,14 @@ public class ExcelUtil<T>
// 用于读取对象中的属性 // 用于读取对象中的属性
Object value = getTargetValue(vo, field, attr); Object value = getTargetValue(vo, field, attr);
String dateFormat = attr.dateFormat(); String dateFormat = attr.dateFormat();
String readConverterExp = attr.readConverterExp();
String separator = attr.separator(); String separator = attr.separator();
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
{ {
cell.setCellValue(parseDateToStr(dateFormat, value)); cell.setCellValue(parseDateToStr(dateFormat, value));
} }
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) else if (fieldConversionMap.get(column)!=null && StringUtils.isNotNull(value))
{ {
cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator)); cell.setCellValue(getConvertValueByExpMap(Convert.toStr(value), separator, fieldConversionMap.get(column)));
} }
else if (value instanceof BigDecimal && -1 != attr.scale()) else if (value instanceof BigDecimal && -1 != attr.scale())
{ {
@ -1031,77 +1082,34 @@ public class ExcelUtil<T>
} }
/** /**
* 解析导出值 0=男,1=女,2=未知 * 通过解析字典,寻找解析值
* *
* @param propertyValue 参数值 * @param propertyValue 解析前的值
* @param converterExp 翻译注解
* @param separator 分隔符 * @param separator 分隔符
* @param conversionMap 解析字典
* @return 解析后值 * @return 解析后值
*/ */
public static String convertByExp(String propertyValue, String converterExp, String separator) public static String getConvertValueByExpMap(String propertyValue,String separator,Map<String,String> conversionMap){
{ List<String> afterConversionValueList=new ArrayList<>();
StringBuilder propertyString = new StringBuilder(); //如果某个对象值为"1,2,3",则根据转换Map表全都进修转换
String[] convertSource = converterExp.split(",");
for (String item : convertSource)
{
String[] itemArray = item.split("=");
if (StringUtils.containsAny(propertyValue, separator)) if (StringUtils.containsAny(propertyValue, separator))
{ {
for (String value : propertyValue.split(separator)) for (String value : propertyValue.split(separator))
{ {
if (itemArray[0].equals(value)) String conversionValue = conversionMap.get(value);
if(StringUtils.isNotEmpty(conversionValue))
{ {
propertyString.append(itemArray[1] + separator); afterConversionValueList.add(conversionValue);
break;
}
} }
} }
else }else
{ {
if (itemArray[0].equals(propertyValue)) if(StringUtils.isNotEmpty(conversionMap.get(propertyValue)))
{ {
return itemArray[1]; afterConversionValueList.add(conversionMap.get(propertyValue));
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
}
/**
* 反向解析值 男=0,女=1,未知=2
*
* @param propertyValue 参数值
* @param converterExp 翻译注解
* @param separator 分隔符
* @return 解析后值
*/
public static String reverseByExp(String propertyValue, String converterExp, String separator)
{
StringBuilder propertyString = new StringBuilder();
String[] convertSource = converterExp.split(",");
for (String item : convertSource)
{
String[] itemArray = item.split("=");
if (StringUtils.containsAny(propertyValue, separator))
{
for (String value : propertyValue.split(separator))
{
if (itemArray[1].equals(value))
{
propertyString.append(itemArray[0] + separator);
break;
}
}
}
else
{
if (itemArray[1].equals(propertyValue))
{
return itemArray[0];
}
} }
} }
return StringUtils.stripEnd(propertyString.toString(), separator); return String.join(separator,afterConversionValueList);
} }
/** /**

Write Preview
Loading…
Cancel
Save