Răsfoiți Sursa

优化参数

RuoYi 4 ani în urmă
părinte
comite
388e36ed4d

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java

@@ -41,8 +41,8 @@ public class DictUtils
         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;
     }

+ 5 - 12
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -201,8 +201,9 @@ public class ExcelUtil<T>
                     // 设置类的私有字段属性可访问.
                     field.setAccessible(true);
                     Integer column = cellMap.get(attr.name());
-                    if(column !=null ) { // 字段在excel 中没有,那么就不需要设置值
-                    	fieldsMap.put(column, field);
+                    if (column != null)
+                    {
+                        fieldsMap.put(column, field);
                     }
                 }
             }
@@ -695,7 +696,7 @@ public class ExcelUtil<T>
         }
         return StringUtils.stripEnd(propertyString.toString(), separator);
     }
-    
+
     /**
      * 解析字典值
      * 
@@ -897,15 +898,7 @@ public class ExcelUtil<T>
                     }
                     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)

+ 5 - 0
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -11,6 +11,11 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.generator.domain.GenTable;
 import com.ruoyi.generator.domain.GenTableColumn;
 
+/**
+ * 模板处理工具类
+ * 
+ * @author ruoyi
+ */
 public class VelocityUtils
 {
     /** 项目空间路径 */