From 388e36ed4dc5024195fbc2a60fa1be64be89d65f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 23 七月 2020 21:45:22 +0800
Subject: [PATCH] 优化参数
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 17 +++++------------
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 5 +++++
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java | 4 ++--
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
index e40b0c0..0d3a23d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -41,8 +41,8 @@
Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
if (StringUtils.isNotNull(cacheObj))
{
- List<SysDictData> DictDatas = StringUtils.cast(cacheObj);
- return DictDatas;
+ List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
+ return dictDatas;
}
return null;
}
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 51dbcd7..13af486 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
@@ -201,8 +201,9 @@
// 璁剧疆绫荤殑绉佹湁瀛楁灞炴�у彲璁块棶.
field.setAccessible(true);
Integer column = cellMap.get(attr.name());
- if(column !=null ) { // 瀛楁鍦╡xcel 涓病鏈夛紝閭ｄ箞灏变笉闇�瑕佽缃��
- fieldsMap.put(column, field);
+ if (column != null)
+ {
+ fieldsMap.put(column, field);
}
}
}
@@ -695,7 +696,7 @@
}
return StringUtils.stripEnd(propertyString.toString(), separator);
}
-
+
/**
* 瑙ｆ瀽瀛楀吀鍊�
*
@@ -897,15 +898,7 @@
}
else
{
- /* if ((Double) val % 1 > 0)
- {
- val = new DecimalFormat("0.00").format(val);
- }
- else
- {
- val = new DecimalFormat("0").format(val);
- }*/
- val = new BigDecimal(val.toString()); // 瀵煎叆鐨勬暟鎹繚璇佸師姹佸師鍛筹紝涓嶅仛澶勭悊
+ val = new BigDecimal(val.toString()); // 娴偣鏍煎紡澶勭悊
}
}
else if (cell.getCellTypeEnum() == CellType.STRING)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index ba0da07..15c23d0 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -11,6 +11,11 @@
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
+/**
+ * 妯℃澘澶勭悊宸ュ叿绫�
+ *
+ * @author ruoyi
+ */
public class VelocityUtils
{
/** 椤圭洰绌洪棿璺緞 */
--
Gitblit v1.9.3