jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/sql/sql.vm
	ruoyi-ui/src/utils/index.js
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
	ruoyi-ui/src/views/tool/gen/importTable.vue
This commit is contained in:
疯狂的狮子li
2020-07-23 09:54:57 +08:00
parent 6f47310c24 1e40e60dbf
commit e19e2fd9cc
16 changed files with 262 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
View File

@ -29,6 +29,11 @@ public @interface Excel
*/
public String dateFormat() default "";
/**
* 如果是字典类型，请设置字典的type值
*/
public String dictType() default "";
/**
* 读取内容转表达式 (如: 0=男,1=女,2=未知)
*/
@ -115,4 +120,4 @@ public @interface Excel
return this.value;
}
}
}
}

6
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
View File

@ -22,6 +22,12 @@ public class GenConstants
/** 树名称字段 */
public static final String TREE_NAME = "treeName";
/** 上级菜单ID字段 */
public static final String PARENT_MENU_ID = "parentMenuId";
/** 上级菜单名称字段 */
public static final String PARENT_MENU_NAME = "parentMenuName";
/** 数据库字符串类型 */
public static final String[] COLUMNTYPE_STR = { "char", "varchar", "narchar", "varchar2", "tinytext", "text",
"mediumtext", "longtext" };

53
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.common.utils;
import java.util.Collection;
import java.util.List;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.redis.RedisCache;
@ -43,6 +42,58 @@ public class DictUtils
return null;
}
/**
* 根据字典类型和字典值获取字典标签
*
* @param dictType 字典类型
* @param dictValue 字典值
* @return 字典标签
*/
public static String getDictLabel(String dictType, String dictValue)
{
if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotEmpty(dictValue))
{
List<SysDictData> datas = getDictCache(dictType);
if (StringUtils.isNotEmpty(datas))
{
for (SysDictData dict : datas)
{
if (dictValue.equals(dict.getDictValue()))
{
return dict.getDictLabel();
}
}
}
}
return dictValue;
}
/**
* 根据字典类型和字典标签获取字典值
*
* @param dictType 字典类型
* @param dictLabel 字典标签
* @return 字典值
*/
public static String getDictValue(String dictType, String dictLabel)
{
if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotEmpty(dictLabel))
{
List<SysDictData> datas = getDictCache(dictType);
if (StringUtils.isNotEmpty(datas))
{
for (SysDictData dict : datas)
{
if (dictLabel.equals(dict.getDictLabel()))
{
return dict.getDictValue();
}
}
}
}
return dictLabel;
}
/**
* 清空字典缓存
*/

38
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

@ -50,6 +50,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
@ -270,7 +271,11 @@ public class ExcelUtil<T>
}
else if (StringUtils.isNotEmpty(attr.readConverterExp()))
{
val = reverseByExp(String.valueOf(val), attr.readConverterExp());
val = reverseByExp(Convert.toStr(val), attr.readConverterExp());
}
else if (StringUtils.isNotEmpty(attr.dictType()))
{
val = reverseDictByExp(attr.dictType(), Convert.toStr(val));
}
ReflectUtils.invokeSetter(entity, propertyName, val);
}
@ -529,13 +534,18 @@ public class ExcelUtil<T>
Object value = getTargetValue(vo, field, attr);
String dateFormat = attr.dateFormat();
String readConverterExp = attr.readConverterExp();
String dictType = attr.dictType();
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
{
cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));
}
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
{
cell.setCellValue(convertByExp(String.valueOf(value), readConverterExp));
cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp));
}
else if (StringUtils.isNotEmpty(dictType))
{
cell.setCellValue(convertDictByExp(dictType, Convert.toStr(value)));
}
else
{
@ -666,6 +676,30 @@ public class ExcelUtil<T>
return propertyValue;
}
/**
* 解析字典值
*
* @param dictType 字典类型
* @param dictValue 字典值
* @return 字典标签
*/
public static String convertDictByExp(String dictType, String dictValue) throws Exception
{
return DictUtils.getDictLabel(dictType, dictValue);
}
/**
* 反向解析值字典值
*
* @param dictType 字典类型
* @param dictValue 字典标签
* @return 字典值
*/
public static String reverseDictByExp(String dictType, String dictLabel) throws Exception
{
return DictUtils.getDictValue(dictType, dictLabel);
}
/**
* 编码文件名
*/