From db28017ec154131d7baf08283dd9b40fdae91373 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 28 二月 2025 13:04:56 +0800
Subject: [PATCH] 优化代码
---
src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java | 2 +-
src/main/java/com/ruoyi/common/utils/Arith.java | 3 +--
src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java | 2 +-
src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java | 2 +-
src/main/resources/mybatis/system/SysUserMapper.xml | 1 -
src/main/java/com/ruoyi/common/utils/StringUtils.java | 26 ++++++++++++++++++++++++++
src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 2 +-
src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 3 +--
src/main/java/com/ruoyi/framework/security/service/TokenService.java | 1 +
9 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/Arith.java b/src/main/java/com/ruoyi/common/utils/Arith.java
index 8668319..f80fb7c 100644
--- a/src/main/java/com/ruoyi/common/utils/Arith.java
+++ b/src/main/java/com/ruoyi/common/utils/Arith.java
@@ -108,7 +108,6 @@
"The scale must be a positive integer or zero");
}
BigDecimal b = new BigDecimal(Double.toString(v));
- BigDecimal one = new BigDecimal("1");
- return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue();
+ return b.divide(BigDecimal.ONE, scale, RoundingMode.HALF_UP).doubleValue();
}
}
diff --git a/src/main/java/com/ruoyi/common/utils/StringUtils.java b/src/main/java/com/ruoyi/common/utils/StringUtils.java
index fc6c6b5..920968f 100644
--- a/src/main/java/com/ruoyi/common/utils/StringUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/StringUtils.java
@@ -287,6 +287,32 @@
}
/**
+ * 鍦ㄥ瓧绗︿覆涓煡鎵剧涓�涓嚭鐜扮殑 `open` 鍜屾渶鍚庝竴涓嚭鐜扮殑 `close` 涔嬮棿鐨勫瓙瀛楃涓�
+ *
+ * @param str 瑕佹埅鍙栫殑瀛楃涓�
+ * @param open 璧峰瀛楃涓�
+ * @param close 缁撴潫瀛楃涓�
+ * @return 鎴彇缁撴灉
+ */
+ public static String substringBetweenLast(final String str, final String open, final String close)
+ {
+ if (isEmpty(str) || isEmpty(open) || isEmpty(close))
+ {
+ return NULLSTR;
+ }
+ final int start = str.indexOf(open);
+ if (start != INDEX_NOT_FOUND)
+ {
+ final int end = str.lastIndexOf(close);
+ if (end != INDEX_NOT_FOUND)
+ {
+ return str.substring(start + open.length(), end);
+ }
+ }
+ return NULLSTR;
+ }
+
+ /**
* 鍒ゆ柇鏄惁涓虹┖锛屽苟涓斾笉鏄┖鐧藉瓧绗�
*
* @param str 瑕佸垽鏂殑value
diff --git a/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java b/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java
index 1e80d5f..9711541 100644
--- a/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java
@@ -105,7 +105,7 @@
*/
public static List<Object[]> getMethodParams(String invokeTarget)
{
- String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
+ String methodStr = StringUtils.substringBetweenLast(invokeTarget, "(", ")");
if (StringUtils.isEmpty(methodStr))
{
return null;
diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 758c308..9b35ace 100644
--- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -1448,8 +1448,7 @@
*/
public String encodingFilename(String filename)
{
- filename = UUID.randomUUID() + "_" + filename + ".xlsx";
- return filename;
+ return UUID.randomUUID() + "_" + filename + ".xlsx";
}
/**
diff --git a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index b57aadd..b1634de 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -52,7 +52,7 @@
* 澶勭悊璇锋眰鍓嶆墽琛�
*/
@Before(value = "@annotation(controllerLog)")
- public void boBefore(JoinPoint joinPoint, Log controllerLog)
+ public void doBefore(JoinPoint joinPoint, Log controllerLog)
{
TIME_THREADLOCAL.set(System.currentTimeMillis());
}
diff --git a/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java b/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
index ac62a57..ca3fb91 100644
--- a/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
@@ -70,7 +70,7 @@
// 璁剧疆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.selectMenuPermsByRoleId(role.getRoleId());
role.setPermissions(rolePerms);
diff --git a/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index 77e3ea9..e09ffe2 100644
--- a/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -120,6 +120,7 @@
Map<String, Object> claims = new HashMap<>();
claims.put(Constants.LOGIN_USER_KEY, token);
+ claims.put(Constants.JWT_USERNAME, loginUser.getUsername());
return createToken(claims);
}
diff --git a/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java b/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
index e8b24ff..0a8e653 100644
--- a/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
+++ b/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
@@ -37,7 +37,7 @@
* @param list 鍒楄〃鏁版嵁
* @param total 鎬昏褰曟暟
*/
- public TableDataInfo(List<?> list, int total)
+ public TableDataInfo(List<?> list, long total)
{
this.rows = list;
this.total = total;
diff --git a/src/main/resources/mybatis/system/SysUserMapper.xml b/src/main/resources/mybatis/system/SysUserMapper.xml
index 0e8e4ce..e3b213f 100644
--- a/src/main/resources/mybatis/system/SysUserMapper.xml
+++ b/src/main/resources/mybatis/system/SysUserMapper.xml
@@ -178,7 +178,6 @@
update sys_user
<set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
- <if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
<if test="email != null ">email = #{email},</if>
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
--
Gitblit v1.9.3