diff --git a/pom.xml b/pom.xml
index 95e63e7bc..4302e8cbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,12 +18,12 @@
UTF-8
1.8
1.3.2
- 1.1.14
+ 1.1.23
1.19
2.9.2
2.3.2
1.2.5
- 1.2.70
+ 1.2.73
3.9.1
2.5
1.3.3
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
index eed41a2ab..b7b8f9799 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
@@ -4,6 +4,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.math.BigDecimal;
/**
* 自定义导出Excel数据注解
@@ -30,7 +31,7 @@ public @interface Excel
public String dateFormat() default "";
/**
- * 如果是字典类型，请设置字典的type值
+ * 如果是字典类型，请设置字典的type值 (如: sys_user_sex)
*/
public String dictType() default "";
@@ -44,6 +45,16 @@ public @interface Excel
*/
public String separator() default ",";
+ /**
+ * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
+ */
+ public int scale() default -1;
+
+ /**
+ * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
+ */
+ public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+
/**
* 导出类型（0数字 1字符串）
*/
@@ -89,6 +100,11 @@ public @interface Excel
*/
public String targetAttr() default "";
+ /**
+ * 是否自动统计数据,在最后追加一行统计数据总和
+ */
+ public boolean isStatistics() default false;
+
/**
* 字段类型（0：导出导入；1：仅导出；2：仅导入）
*/
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
index 8e95f379b..04b6b7dc0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -29,7 +29,7 @@ public class GenConstants
public static final String PARENT_MENU_NAME = "parentMenuName";
/** 数据库字符串类型 */
- public static final String[] COLUMNTYPE_STR = { "char", "varchar", "narchar", "varchar2", "tinytext", "text",
+ public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2", "tinytext", "text",
"mediumtext", "longtext" };
/** 数据库时间类型 */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
index e6dd98e22..23f1f8bd5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
@@ -18,8 +18,8 @@ public class PageDomain
/** 排序列 */
private String orderByColumn;
- /** 排序的方向 "desc" 或者 "asc". */
- private String isAsc;
+ /** 排序的方向desc或者asc */
+ private String isAsc = "asc";
public String getOrderBy()
{
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 d950b77f4..4e93c6cfe 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
@@ -6,8 +6,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.math.BigDecimal;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -15,6 +15,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
@@ -102,6 +103,16 @@ public class ExcelUtil
*/
private List fields;
+ /**
+ * 统计列表
+ */
+ private Map statistics = new HashMap();
+
+ /**
+ * 数字格式
+ */
+ private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
+
/**
* 实体对象
*/
@@ -341,6 +352,7 @@ public class ExcelUtil
if (Type.EXPORT.equals(type))
{
fillExcelData(index, row);
+ addStatisticsRow();
}
}
String filename = encodingFilename(sheetName);
@@ -447,6 +459,15 @@ public class ExcelUtil
headerFont.setColor(IndexedColors.WHITE.getIndex());
style.setFont(headerFont);
styles.put("header", style);
+
+ style = wb.createCellStyle();
+ style.setAlignment(HorizontalAlignment.CENTER);
+ style.setVerticalAlignment(VerticalAlignment.CENTER);
+ Font totalFont = wb.createFont();
+ totalFont.setFontName("Arial");
+ totalFont.setFontHeightInPoints((short) 10);
+ style.setFont(totalFont);
+ styles.put("total", style);
return styles;
}
@@ -546,15 +567,20 @@ public class ExcelUtil
{
cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
}
- else if (StringUtils.isNotEmpty(dictType))
+ else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value))
{
cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));
}
+ else if (value instanceof BigDecimal && -1 != attr.scale())
+ {
+ cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString());
+ }
else
{
// 设置列类型
setCellVo(value, attr, cell);
}
+ addStatisticsData(column, Convert.toStr(value), attr);
}
}
catch (Exception e)
@@ -721,6 +747,53 @@ public class ExcelUtil
return DictUtils.getDictValue(dictType, dictLabel, separator);
}
+ /**
+ * 合计统计信息
+ */
+ private void addStatisticsData(Integer index, String text, Excel entity)
+ {
+ if (entity != null && entity.isStatistics())
+ {
+ Double temp = 0D;
+ if (!statistics.containsKey(index))
+ {
+ statistics.put(index, temp);
+ }
+ try
+ {
+ temp = Double.valueOf(text);
+ }
+ catch (NumberFormatException e)
+ {
+ }
+ statistics.put(index, statistics.get(index) + temp);
+ }
+ }
+
+ /**
+ * 创建统计行
+ */
+ public void addStatisticsRow()
+ {
+ if (statistics.size() > 0)
+ {
+ Cell cell = null;
+ Row row = sheet.createRow(sheet.getLastRowNum() + 1);
+ Set keys = statistics.keySet();
+ cell = row.createCell(0);
+ cell.setCellStyle(styles.get("total"));
+ cell.setCellValue("合计");
+
+ for (Integer key : keys)
+ {
+ cell = row.createCell(key);
+ cell.setCellStyle(styles.get("total"));
+ cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
+ }
+ statistics.clear();
+ }
+ }
+
/**
* 编码文件名
*/
@@ -790,9 +863,9 @@ public class ExcelUtil
if (StringUtils.isNotEmpty(name))
{
Class clazz = o.getClass();
- String methodName = "get" + name.substring(0, 1).toUpperCase() + name.substring(1);
- Method method = clazz.getMethod(methodName);
- o = method.invoke(o);
+ Field field = clazz.getDeclaredField(name);
+ field.setAccessible(true);
+ o = field.get(o);
}
return o;
}
@@ -896,7 +969,14 @@ public class ExcelUtil
}
else
{
- val = new BigDecimal(val.toString()); // 浮点格式处理
+ if ((Double) val % 1 > 0)
+ {
+ val = new BigDecimal(val.toString());
+ }
+ else
+ {
+ val = new DecimalFormat("0").format(val);
+ }
}
}
else if (cell.getCellTypeEnum() == CellType.STRING)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 469494749..a796f841c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -79,11 +79,11 @@ public class DataScopeAspect
}
// 获取当前的用户
LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
- SysUser currentUser = loginUser.getUser();
- if (currentUser != null)
+ if (StringUtils.isNotNull(loginUser))
{
+ SysUser currentUser = loginUser.getUser();
// 如果是超级管理员，则不过滤数据
- if (!currentUser.isAdmin())
+ if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
{
dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
controllerDataScope.userAlias());
@@ -142,8 +142,12 @@ public class DataScopeAspect
if (StringUtils.isNotBlank(sqlString.toString()))
{
- BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0];
- baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+ Object params = joinPoint.getArgs()[0];
+ if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+ {
+ BaseEntity baseEntity = (BaseEntity) params;
+ baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+ }
}
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 10531590f..786611507 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -88,7 +88,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
protected void configure(HttpSecurity httpSecurity) throws Exception
{
httpSecurity
- // CRSF禁用，因为不使用session
+ // CSRF禁用，因为不使用session
.csrf().disable()
// 认证失败处理类
.exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index bee9ae12b..86cc4cffb 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -340,7 +340,7 @@ public class GenTableColumn extends BaseEntity
public static boolean isUsableColumn(String javaField)
{
// isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
- return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum");
+ return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
}
public String readConverterExp()
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index 495a94c25..ba7dd18c3 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -66,7 +66,7 @@
v-hasPermi="['${moduleName}:${businessName}:add']"
>新增
-
+
#elseif($column.htmlType == "select" && "" != $dictType)
-
+
#elseif($column.htmlType == "select" && $dictType)
-
+
@@ -272,9 +272,8 @@ export default {
#else
#set($comment=$column.columnComment)
#end
-#set($comment=$column.columnComment)
$column.javaField: [
- { required: true, message: "$comment不能为空", trigger: "blur" }
+ { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
]#if($velocityCount != $columns.size()),#end
#end
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 3e5298c69..b5e45f5c5 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -169,7 +169,7 @@
#elseif($column.htmlType == "select" && "" != $dictType)
-
+
#elseif($column.htmlType == "select" && $dictType)
-
+
@@ -306,9 +306,8 @@ export default {
#else
#set($comment=$column.columnComment)
#end
-#set($comment=$column.columnComment)
$column.javaField: [
- { required: true, message: "$comment不能为空", trigger: "blur" }
+ { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
]#if($velocityCount != $columns.size()),#end
#end
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index ec8113ec1..d32e033a9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -267,13 +267,7 @@ public class SysDeptServiceImpl implements ISysDeptService
{
if (hasChild(list, tChild))
{
- // 判断是否有子节点
- Iterator it = childList.iterator();
- while (it.hasNext())
- {
- SysDept n = (SysDept) it.next();
- recursionFn(list, n);
- }
+ recursionFn(list, tChild);
}
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index c38951bc4..2db4341b4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -76,12 +76,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
public List selectDictDataByType(String dictType)
{
List dictDatas = DictUtils.getDictCache(dictType);
- if (StringUtils.isNotNull(dictDatas))
+ if (StringUtils.isNotEmpty(dictDatas))
{
return dictDatas;
}
dictDatas = dictDataMapper.selectDictDataByType(dictType);
- if (StringUtils.isNotNull(dictDatas))
+ if (StringUtils.isNotEmpty(dictDatas))
{
DictUtils.setDictCache(dictType, dictDatas);
return dictDatas;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index d3fb074ba..51fb662fd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -178,14 +178,19 @@ public class SysMenuServiceImpl implements ISysMenuService
public List buildMenuTree(List menus)
{
List returnList = new ArrayList();
+ List tempList = new ArrayList();
+ for (SysMenu dept : menus)
+ {
+ tempList.add(dept.getMenuId());
+ }
for (Iterator iterator = menus.iterator(); iterator.hasNext();)
{
- SysMenu t = (SysMenu) iterator.next();
- // 根据传入的某个父节点ID,遍历该父节点的所有子节点
- if (t.getParentId() == 0)
+ SysMenu menu = (SysMenu) iterator.next();
+ // 如果是顶级节点, 遍历该父节点的所有子节点
+ if (!tempList.contains(menu.getParentId()))
{
- recursionFn(menus, t);
- returnList.add(t);
+ recursionFn(menus, menu);
+ returnList.add(menu);
}
}
if (returnList.isEmpty())
@@ -406,13 +411,7 @@ public class SysMenuServiceImpl implements ISysMenuService
{
if (hasChild(list, tChild))
{
- // 判断是否有子节点
- Iterator it = childList.iterator();
- while (it.hasNext())
- {
- SysMenu n = (SysMenu) it.next();
- recursionFn(list, n);
- }
+ recursionFn(list, tChild);
}
}
}
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index d5e3dd726..b4173d3f6 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -86,7 +86,7 @@
"mockjs": "1.0.1-beta3",
"plop": "2.3.0",
"runjs": "4.3.2",
- "sass": "1.26.10",
+ "node-sass": "4.14.1",
"sass-loader": "8.0.2",
"script-ext-html-webpack-plugin": "2.1.3",
"script-loader": "0.7.2",
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index 7fadf6f60..162d240b2 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -1,153 +1,122 @@
-
-
-
-
-
-
-
+
+