From 92c630128545884479adbc060b1f0b79bc66d1d2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 23 七月 2020 18:58:45 +0800
Subject: [PATCH] Excel支持分割字符串组内容
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 85 ++++++++++++++++++++++++++----------------
1 files changed, 52 insertions(+), 33 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 affb08f..2d6ed8c 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
@@ -271,11 +271,11 @@
}
else if (StringUtils.isNotEmpty(attr.readConverterExp()))
{
- val = reverseByExp(Convert.toStr(val), attr.readConverterExp());
+ val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
}
else if (StringUtils.isNotEmpty(attr.dictType()))
{
- val = reverseDictByExp(attr.dictType(), Convert.toStr(val));
+ val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
}
ReflectUtils.invokeSetter(entity, propertyName, val);
}
@@ -534,6 +534,7 @@
Object value = getTargetValue(vo, field, attr);
String dateFormat = attr.dateFormat();
String readConverterExp = attr.readConverterExp();
+ String separator = attr.separator();
String dictType = attr.dictType();
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
{
@@ -541,11 +542,11 @@
}
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
{
- cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp));
+ cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
}
else if (StringUtils.isNotEmpty(dictType))
{
- cell.setCellValue(convertDictByExp(dictType, Convert.toStr(value)));
+ cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));
}
else
{
@@ -623,28 +624,36 @@
*
* @param propertyValue 参数值
* @param converterExp 翻译注解
+ * @param separator 分隔符
* @return 解析后值
- * @throws Exception
*/
- public static String convertByExp(String propertyValue, String converterExp) throws Exception
+ public static String convertByExp(String propertyValue, String converterExp, String separator)
{
- try
+ StringBuilder propertyString = new StringBuilder();
+ String[] convertSource = converterExp.split(",");
+ for (String item : convertSource)
{
- String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
+ String[] itemArray = item.split("=");
+ if (StringUtils.containsAny(separator, propertyValue))
{
- String[] itemArray = item.split("=");
+ for (String value : propertyValue.split(separator))
+ {
+ if (itemArray[0].equals(value))
+ {
+ propertyString.append(itemArray[1] + separator);
+ break;
+ }
+ }
+ }
+ else
+ {
if (itemArray[0].equals(propertyValue))
{
return itemArray[1];
}
}
}
- catch (Exception e)
- {
- throw e;
- }
- return propertyValue;
+ return StringUtils.stripEnd(propertyString.toString(), separator);
}
/**
@@ -652,52 +661,62 @@
*
* @param propertyValue 参数值
* @param converterExp 翻译注解
+ * @param separator 分隔符
* @return 解析后值
- * @throws Exception
*/
- public static String reverseByExp(String propertyValue, String converterExp) throws Exception
+ public static String reverseByExp(String propertyValue, String converterExp, String separator)
{
- try
+ StringBuilder propertyString = new StringBuilder();
+ String[] convertSource = converterExp.split(",");
+ for (String item : convertSource)
{
- String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
+ String[] itemArray = item.split("=");
+ if (StringUtils.containsAny(separator, propertyValue))
{
- String[] itemArray = item.split("=");
+ 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];
}
}
}
- catch (Exception e)
- {
- throw e;
- }
- return propertyValue;
+ return StringUtils.stripEnd(propertyString.toString(), separator);
}
-
+
/**
* 解析字典值
*
- * @param dictType 字典类型
* @param dictValue 字典值
+ * @param dictType 字典类型
+ * @param separator 分隔符
* @return 字典标签
*/
- public static String convertDictByExp(String dictType, String dictValue) throws Exception
+ public static String convertDictByExp(String dictValue, String dictType, String separator)
{
- return DictUtils.getDictLabel(dictType, dictValue);
+ return DictUtils.getDictLabel(dictType, dictValue, separator);
}
/**
* 反向解析值字典值
*
+ * @param dictLabel 字典标签
* @param dictType 字典类型
- * @param dictValue 字典标签
+ * @param separator 分隔符
* @return 字典值
*/
- public static String reverseDictByExp(String dictType, String dictLabel) throws Exception
+ public static String reverseDictByExp(String dictLabel, String dictType, String separator)
{
- return DictUtils.getDictValue(dictType, dictLabel);
+ return DictUtils.getDictValue(dictType, dictLabel, separator);
}
/**
--
Gitblit v1.9.2