修改日志输出

alien-entity/src/main/java/shop/alien/mapper/StorePlatformRoleMapper.java

@@ -2,6 +2,8 @@ package shop.alien.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import shop.alien.entity.store.StorePlatformRole;
 
 /**
@@ -13,5 +15,7 @@ import shop.alien.entity.store.StorePlatformRole;
 @Mapper
 public interface StorePlatformRoleMapper extends BaseMapper<StorePlatformRole> {
 
+    @Select("SELECT role_name FROM store_platform_role WHERE role_id = #{roleId} LIMIT 1")
+    String selectRoleNameById(@Param("roleId") Long roleId);
 }
 

alien-store-platform/src/main/java/shop/alien/storeplatform/aspect/PlatformOperationLogAspect.java

@@ -32,6 +32,7 @@ import shop.alien.storeplatform.dto.UpdateRoleDto;
 import shop.alien.storeplatform.service.PlatformOperationLogService;
 import com.alibaba.fastjson.JSONObject;
 import shop.alien.storeplatform.service.StorePlatformRoleMenuService;
+import shop.alien.storeplatform.service.StorePlatformRoleQueryService;
 import shop.alien.storeplatform.service.StorePlatformRoleService;
 import shop.alien.storeplatform.util.LoginUserUtil;
 
@@ -60,6 +61,7 @@ public class PlatformOperationLogAspect {
     private final StorePlatformRoleMenuService storePlatformRoleMenuService;
     private final StorePlatformMenuMapper storePlatformMenuMapper;
     private final StoreUserMapper storeUserMapper;
+    private final StorePlatformRoleQueryService storePlatformRoleQueryService;
     private final SpelExpressionParser spelExpressionParser = new SpelExpressionParser();
     private final DefaultParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
     private final TemplateParserContext templateParserContext = new TemplateParserContext("#{", "}");
@@ -227,7 +229,7 @@ public class PlatformOperationLogAspect {
 
         String accountName = resolveAccountName(userId);
         String roleName = resolveRoleName(roleId);
-        return String.format("移除用户%s的角色%s", accountName, roleName);
+        return String.format("移除用户%s的%s角色", accountName, roleName);
     }
 
     private String resolveAccountName(Integer userId) {
@@ -246,11 +248,11 @@ public class PlatformOperationLogAspect {
     }
 
     private String resolveRoleName(Long roleId) {
-        StorePlatformRole role = storePlatformRoleService.getRoleById(roleId);
-        if (role == null || !StringUtils.hasText(role.getRoleName())) {
+        String roleName = storePlatformRoleQueryService.getRoleNameById(roleId);
+        if (!StringUtils.hasText(roleName)) {
             return "未知";
         }
-        return role.getRoleName();
+        return roleName;
     }
 
     private String buildParamsJson(String[] parameterNames, Object[] args) {
@@ -298,10 +300,7 @@ public class PlatformOperationLogAspect {
         }
 
         if ((roleName == null || roleName.trim().isEmpty()) && roleId != null) {
-            StorePlatformRole role = storePlatformRoleService.getRoleById(roleId);
-            if (role != null) {
-                roleName = role.getRoleName();
-            }
+             roleName = resolveRoleName(roleId);
         }
 
         if ((menuIds == null || menuIds.isEmpty()) && roleId != null) {

alien-store-platform/src/main/java/shop/alien/storeplatform/service/StorePlatformRoleQueryService.java

@@ -0,0 +1,15 @@
+package shop.alien.storeplatform.service;
+
+/**
+ * 角色查询服务（SQL实现）
+ */
+public interface StorePlatformRoleQueryService {
+
+    /**
+     * 根据角色ID查询角色名
+     *
+     * @param roleId 角色ID
+     * @return 角色名
+     */
+    String getRoleNameById(Long roleId);
+}

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/StorePlatformRoleQueryServiceImpl.java

@@ -0,0 +1,26 @@
+package shop.alien.storeplatform.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import shop.alien.mapper.StorePlatformRoleMapper;
+import shop.alien.storeplatform.service.StorePlatformRoleQueryService;
+
+/**
+ * 角色查询服务实现（SQL实现）
+ */
+@Service
+@RequiredArgsConstructor
+public class StorePlatformRoleQueryServiceImpl implements StorePlatformRoleQueryService {
+
+    private final StorePlatformRoleMapper storePlatformRoleMapper;
+
+    @Override
+    public String getRoleNameById(Long roleId) {
+        if (roleId == null) {
+            return null;
+        }
+        String roleName = storePlatformRoleMapper.selectRoleNameById(roleId);
+        return StringUtils.hasText(roleName) ? roleName : null;
+    }
+}