From 9aee5142fd9b40c7a5fefa4cc8d94c7c197e70c6 Mon Sep 17 00:00:00 2001 From: Sxile <3440626@qq.com> Date: Fri, 19 Jun 2020 17:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=A8=E9=87=8A=E4=B8=8E?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0=E4=B8=8D=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java | 3 ++- .../java/com/ruoyi/common/security/service/PermissionService.java | 2 +- .../java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java | 2 +- .../main/java/com/ruoyi/gen/service/IGenTableColumnService.java | 2 +- .../ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java | 2 +- .../ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java | 8 ++++---- .../src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java | 2 +- .../ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java | 2 +- .../main/java/com/ruoyi/system/service/ISysPermissionService.java | 4 ++-- .../com/ruoyi/system/service/impl/SysPermissionServiceImpl.java | 6 ++++-- 10 files changed, 18 insertions(+), 15 deletions(-) diff --git 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 index 6773fa9..b03674c 100644 --- 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 @@ -98,7 +98,8 @@ public class DataScopeAspect * * @param joinPoint 切点 * @param user 用户 - * @param alias 别名 + * @param deptAlias 部门别名 + * @param userAlias 用户别名 */ public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias) { diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/PermissionService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/PermissionService.java index 967f567..cbfc9bb 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/PermissionService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/PermissionService.java @@ -155,7 +155,7 @@ public class PermissionService /** * 判断是否包含权限 * - * @param permissions 权限列表 + * @param authorities 权限列表 * @param permission 权限字符串 * @return 用户是否具备某权限 */ diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java index 268a4f0..8aac0e4 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java @@ -21,7 +21,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService /** * 查询业务字段列表 * - * @param genTableColumn 业务字段编号 + * @param tableId 业务字段编号 * @return 业务字段集合 */ @Override diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java index 67e432c..f7dec84 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java @@ -13,7 +13,7 @@ public interface IGenTableColumnService /** * 查询业务字段列表 * - * @param genTableColumn 业务字段编号 + * @param tableId 业务字段编号 * @return 业务字段集合 */ public List selectGenTableColumnListByTableId(Long tableId); diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java index 6cb8909..39fdd42 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java @@ -195,7 +195,7 @@ public class GenUtils /** * 关键字替换 * - * @param name 需要被替换的名字 + * @param text 需要被替换的名字 * @return 替换后的名字 */ public static String replaceText(String text) diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java index b78f535..6902e62 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java @@ -190,7 +190,7 @@ public class VelocityUtils /** * 根据列类型获取导入包 * - * @param column 列集合 + * @param columns 列集合 * @return 返回需要导入的包列表 */ public static HashSet getImportList(List columns) @@ -227,7 +227,7 @@ public class VelocityUtils /** * 获取树编码 * - * @param options 生成其他选项 + * @param paramsObj 生成其他选项 * @return 树编码 */ public static String getTreecode(JSONObject paramsObj) @@ -242,7 +242,7 @@ public class VelocityUtils /** * 获取树父编码 * - * @param options 生成其他选项 + * @param paramsObj 生成其他选项 * @return 树父编码 */ public static String getTreeParentCode(JSONObject paramsObj) @@ -257,7 +257,7 @@ public class VelocityUtils /** * 获取树名称 * - * @param options 生成其他选项 + * @param paramsObj 生成其他选项 * @return 树名称 */ public static String getTreeName(JSONObject paramsObj) diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java index d79f001..0097d1e 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java @@ -65,7 +65,7 @@ public abstract class AbstractQuartzJob implements Job * 执行后 * * @param context 工作执行上下文对象 - * @param sysScheduleJob 系统计划任务 + * @param sysJob 系统计划任务 */ protected void after(JobExecutionContext context, SysJob sysJob, Exception e) { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java index 844556f..f8ed1b3 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java @@ -65,7 +65,7 @@ public class JobInvokeUtil /** * 校验是否为为class包名 * - * @param str 名称 + * @param invokeTarget 名称 * @return true是 false否 */ public static boolean isValidClassName(String invokeTarget) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java index 86c8777..f020bf9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java @@ -7,7 +7,7 @@ public interface ISysPermissionService /** * 获取角色数据权限 * - * @param user 用户信息 + * @param userId 用户Id * @return 角色权限信息 */ public Set getRolePermission(Long userId); @@ -15,7 +15,7 @@ public interface ISysPermissionService /** * 获取菜单数据权限 * - * @param user 用户信息 + * @param userId 用户Id * @return 菜单权限信息 */ public Set getMenuPermission(Long userId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java index f8c1676..47f4961 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java @@ -22,9 +22,10 @@ public class SysPermissionServiceImpl implements ISysPermissionService /** * 获取角色数据权限 * - * @param user 用户信息 + * @param userId 用户Id * @return 角色权限信息 */ + @Override public Set getRolePermission(Long userId) { Set roles = new HashSet(); @@ -43,9 +44,10 @@ public class SysPermissionServiceImpl implements ISysPermissionService /** * 获取菜单数据权限 * - * @param user 用户信息 + * @param userId 用户Id * @return 菜单权限信息 */ + @Override public Set getMenuPermission(Long userId) { Set perms = new HashSet();