优化代码

ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java

@@ -37,7 +37,7 @@ public class TableDataInfo implements Serializable
      * @param list 列表数据
      * @param total 总记录数
      */
-    public TableDataInfo(List<?> list, int total)
+    public TableDataInfo(List<?> list, long total)
     {
         this.rows = list;
         this.total = total;

ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java

@@ -108,7 +108,6 @@ public class Arith
                     "The scale must be a positive integer or zero");
         }
         BigDecimal b = new BigDecimal(Double.toString(v));
-        BigDecimal one = BigDecimal.ONE;
-        return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue();
+        return b.divide(BigDecimal.ONE, scale, RoundingMode.HALF_UP).doubleValue();
     }
 }

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

@@ -1448,8 +1448,7 @@ public class ExcelUtil<T>
      */
     public String encodingFilename(String filename)
     {
-        filename = UUID.randomUUID() + "_" + filename + ".xlsx";
-        return filename;
+        return UUID.randomUUID() + "_" + filename + ".xlsx";
     }
 
     /**

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

@@ -49,7 +49,7 @@ public class LogAspect
      * 处理请求前执行
      */
     @Before(value = "@annotation(controllerLog)")
-    public void boBefore(JoinPoint joinPoint, Log controllerLog)
+    public void doBefore(JoinPoint joinPoint, Log controllerLog)
     {
         TIME_THREADLOCAL.set(System.currentTimeMillis());
     }

ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java

@@ -163,7 +163,7 @@ public class SysLoginService
             // 设置permissions属性，以便数据权限匹配权限
             for (SysRole role : roles)
             {
-                if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL))
+                if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && !role.isAdmin())
                 {
                     Set<String> rolePerms = menuService.selectPermsByRoleId(role.getRoleId());
                     role.setPermissions(rolePerms);

ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

@@ -229,7 +229,7 @@ public class SysJobController extends BaseController
     }
 
     /**
-     * 查询cron表达式近5次的执行时间
+     * 查询cron表达式近10次的执行时间
      */
     @GetMapping("/queryCronExpression")
     @ResponseBody