添加google-style 格式化maven插件，fix utf8文件编码问题

2026-01-29 21:11:57 +08:00 · 2025-12-14 15:00:22 +08:00
parent f53b783049
commit a5fb62f1e5
300 changed files with 21281 additions and 25221 deletions
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
+++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
@@ -8,26 +8,19 @@ import java.lang.annotation.Target;

 /**
 * 数据权限过滤注解
- * 
+ *
 * @author ruoyi
 */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
-public @interface DataScope
-{
-    /**
-     * 部门表的别名
-     */
-    public String deptAlias() default "";
+public @interface DataScope {
+  /** 部门表的别名 */
+  public String deptAlias() default "";

-    /**
-     * 用户表的别名
-     */
-    public String userAlias() default "";
+  /** 用户表的别名 */
+  public String userAlias() default "";

-    /**
-     * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来
-     */
-    public String permission() default "";
+  /** 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来 */
+  public String permission() default "";
 }
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
+++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
@@ -1,11 +1,5 @@
 package com.ruoyi.common.datascope.aspect;

-import java.util.ArrayList;
-import java.util.List;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.core.text.Convert;
@@ -16,169 +10,160 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
+import java.util.ArrayList;
+import java.util.List;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;

 /**
 * 数据过滤处理
- * 
+ *
 * @author ruoyi
 */
@Aspect
@Component
-public class DataScopeAspect
-{
-    /**
-     * 全部数据权限
-     */
-    public static final String DATA_SCOPE_ALL = "1";
+public class DataScopeAspect {
+  /** 全部数据权限 */
+  public static final String DATA_SCOPE_ALL = "1";

-    /**
-     * 自定数据权限
-     */
-    public static final String DATA_SCOPE_CUSTOM = "2";
+  /** 自定数据权限 */
+  public static final String DATA_SCOPE_CUSTOM = "2";

-    /**
-     * 部门数据权限
-     */
-    public static final String DATA_SCOPE_DEPT = "3";
+  /** 部门数据权限 */
+  public static final String DATA_SCOPE_DEPT = "3";

-    /**
-     * 部门及以下数据权限
-     */
-    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+  /** 部门及以下数据权限 */
+  public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";

-    /**
-     * 仅本人数据权限
-     */
-    public static final String DATA_SCOPE_SELF = "5";
+  /** 仅本人数据权限 */
+  public static final String DATA_SCOPE_SELF = "5";

-    /**
-     * 数据权限过滤关键字
-     */
-    public static final String DATA_SCOPE = "dataScope";
+  /** 数据权限过滤关键字 */
+  public static final String DATA_SCOPE = "dataScope";

-    @Before("@annotation(controllerDataScope)")
-    public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable
-    {
-        clearDataScope(point);
-        handleDataScope(point, controllerDataScope);
+  @Before("@annotation(controllerDataScope)")
+  public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable {
+    clearDataScope(point);
+    handleDataScope(point, controllerDataScope);
+  }
+
+  protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) {
+    // 获取当前的用户
+    LoginUser loginUser = SecurityUtils.getLoginUser();
+    if (StringUtils.isNotNull(loginUser)) {
+      SysUser currentUser = loginUser.getSysUser();
+      // 如果是超级管理员，则不过滤数据
+      if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
+        String permission =
+            StringUtils.defaultIfEmpty(
+                controllerDataScope.permission(), SecurityContextHolder.getPermission());
+        dataScopeFilter(
+            joinPoint,
+            currentUser,
+            controllerDataScope.deptAlias(),
+            controllerDataScope.userAlias(),
+            permission);
+      }
    }
+  }

-    protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope)
-    {
-        // 获取当前的用户
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (StringUtils.isNotNull(loginUser))
-        {
-            SysUser currentUser = loginUser.getSysUser();
-            // 如果是超级管理员，则不过滤数据
-            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
-            {
-                String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission());
-                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
-            }
-        }
-    }
-
-    /**
-     * 数据范围过滤
-     * 
-     * @param joinPoint 切点
-     * @param user 用户
-     * @param deptAlias 部门别名
-     * @param userAlias 用户别名
-     * @param permission 权限字符
-     */
-    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission)
-    {
-        StringBuilder sqlString = new StringBuilder();
-        List<String> conditions = new ArrayList<String>();
-        List<String> scopeCustomIds = new ArrayList<String>();
-        user.getRoles().forEach(role -> {
-            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
-            {
+  /**
+   * 数据范围过滤
+   *
+   * @param joinPoint 切点
+   * @param user 用户
+   * @param deptAlias 部门别名
+   * @param userAlias 用户别名
+   * @param permission 权限字符
+   */
+  public static void dataScopeFilter(
+      JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission) {
+    StringBuilder sqlString = new StringBuilder();
+    List<String> conditions = new ArrayList<String>();
+    List<String> scopeCustomIds = new ArrayList<String>();
+    user.getRoles()
+        .forEach(
+            role -> {
+              if (DATA_SCOPE_CUSTOM.equals(role.getDataScope())
+                  && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL)
+                  && (StringUtils.isEmpty(permission)
+                      || StringUtils.containsAny(
+                          role.getPermissions(), Convert.toStrArray(permission)))) {
                scopeCustomIds.add(Convert.toStr(role.getRoleId()));
-            }
-        });
+              }
+            });

-        for (SysRole role : user.getRoles())
-        {
-            String dataScope = role.getDataScope();
-            if (conditions.contains(dataScope) || StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE))
-            {
-                continue;
-            }
-            if (StringUtils.isNotEmpty(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
-            {
-                continue;
-            }
-            if (DATA_SCOPE_ALL.equals(dataScope))
-            {
-                sqlString = new StringBuilder();
-                conditions.add(dataScope);
-                break;
-            }
-            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
-            {
-                if (scopeCustomIds.size() > 1)
-                {
-                    // 多个自定数据权限使用in查询，避免多次拼接。
-                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
-                }
-                else
-                {
-                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
-                }
-            }
-            else if (DATA_SCOPE_DEPT.equals(dataScope))
-            {
-                sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
-            }
-            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
-            {
-                sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
-            }
-            else if (DATA_SCOPE_SELF.equals(dataScope))
-            {
-                if (StringUtils.isNotBlank(userAlias))
-                {
-                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
-                }
-                else
-                {
-                    // 数据权限为仅本人且没有userAlias别名不查询任何数据
-                    sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
-                }
-            }
-            conditions.add(dataScope);
+    for (SysRole role : user.getRoles()) {
+      String dataScope = role.getDataScope();
+      if (conditions.contains(dataScope)
+          || StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE)) {
+        continue;
+      }
+      if (StringUtils.isNotEmpty(permission)
+          && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) {
+        continue;
+      }
+      if (DATA_SCOPE_ALL.equals(dataScope)) {
+        sqlString = new StringBuilder();
+        conditions.add(dataScope);
+        break;
+      } else if (DATA_SCOPE_CUSTOM.equals(dataScope)) {
+        if (scopeCustomIds.size() > 1) {
+          // 多个自定数据权限使用in查询，避免多次拼接。
+          sqlString.append(
+              StringUtils.format(
+                  " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ",
+                  deptAlias,
+                  String.join(",", scopeCustomIds)));
+        } else {
+          sqlString.append(
+              StringUtils.format(
+                  " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ",
+                  deptAlias,
+                  role.getRoleId()));
        }
-
-        // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据
-        if (StringUtils.isEmpty(conditions))
-        {
-            sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
-        }
-
-        if (StringUtils.isNotBlank(sqlString.toString()))
-        {
-            Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
-            {
-                BaseEntity baseEntity = (BaseEntity) params;
-                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
-            }
+      } else if (DATA_SCOPE_DEPT.equals(dataScope)) {
+        sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
+      } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
+        sqlString.append(
+            StringUtils.format(
+                " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+                deptAlias,
+                user.getDeptId(),
+                user.getDeptId()));
+      } else if (DATA_SCOPE_SELF.equals(dataScope)) {
+        if (StringUtils.isNotBlank(userAlias)) {
+          sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+        } else {
+          // 数据权限为仅本人且没有userAlias别名不查询任何数据
+          sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
        }
+      }
+      conditions.add(dataScope);
    }

-    /**
-     * 拼接权限sql前先清空params.dataScope参数防止注入
-     */
-    private void clearDataScope(final JoinPoint joinPoint)
-    {
-        Object params = joinPoint.getArgs()[0];
-        if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
-        {
-            BaseEntity baseEntity = (BaseEntity) params;
-            baseEntity.getParams().put(DATA_SCOPE, "");
-        }
+    // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据
+    if (StringUtils.isEmpty(conditions)) {
+      sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
    }
+
+    if (StringUtils.isNotBlank(sqlString.toString())) {
+      Object params = joinPoint.getArgs()[0];
+      if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
+        BaseEntity baseEntity = (BaseEntity) params;
+        baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+      }
+    }
+  }
+
+  /** 拼接权限sql前先清空params.dataScope参数防止注入 */
+  private void clearDataScope(final JoinPoint joinPoint) {
+    Object params = joinPoint.getArgs()[0];
+    if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
+      BaseEntity baseEntity = (BaseEntity) params;
+      baseEntity.getParams().put(DATA_SCOPE, "");
+    }
+  }
 }