From 4fc51fa0b5d7400960d9741e7c3f5b1e593c0a47 Mon Sep 17 00:00:00 2001 From: Odboy Date: Wed, 14 Jan 2026 22:45:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E7=BB=9F=E4=B8=80=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/odboy/system/service/SystemAuthService.java | 4 ++-- .../odboy/system/service/SystemCaptchaService.java | 4 ++-- .../cn/odboy/system/service/SystemDataService.java | 6 +++--- .../cn/odboy/system/service/SystemDeptService.java | 12 ++++++------ .../system/service/SystemDictDetailService.java | 2 +- .../cn/odboy/system/service/SystemJobService.java | 9 ++++++++- .../cn/odboy/system/service/SystemMenuService.java | 8 ++++---- .../odboy/system/service/SystemMonitorService.java | 10 +++++----- .../odboy/system/service/SystemQuartzJobService.java | 4 ++-- .../cn/odboy/system/service/SystemRoleService.java | 2 +- .../odboy/system/service/SystemUserDeptService.java | 3 +++ 11 files changed, 37 insertions(+), 27 deletions(-) diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java index 6f93ddc4..cab708b6 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java @@ -52,7 +52,7 @@ public class SystemAuthService { KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginArgs.getPassword()); // 校验验证码 systemCaptchaService.validate(loginArgs.getUuid(), loginArgs.getCode()); - // 获取用户信息 + // 查询用户信息 SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginArgs.getUsername()); // 验证用户密码 if (!passwordEncoder.matches(password, jwtUser.getPassword())) { @@ -83,7 +83,7 @@ public class SystemAuthService { } /** - * 获取当前登录人信息 -> TestPassed + * 查询当前登录人信息 -> TestPassed */ public SystemUserJwtVo getCurrentUserInfo() { SystemUserJwtVo jwtUser = (SystemUserJwtVo) KitSecurityHelper.getCurrentUser(); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java index 6f1e9613..09a05676 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java @@ -26,10 +26,10 @@ public class SystemCaptchaService { private AppProperties properties; /** - * 获取登录验证码 -> TestPassed + * 查询登录验证码 -> TestPassed */ public SystemCaptchaVo getLoginCaptcha() { - // 获取运算的结果 + // 查询运算的结果 Captcha captcha = properties.getLogin().getCaptchaSetting().getCaptcha(); String uuid = SystemCacheKey.CAPTCHA_LOGIN + IdUtil.simpleUUID(); //当验证码类型为 arithmetic时且长度 >= 2 时, captcha.text()的结果有几率为浮点型 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java index beb91250..7be790ab 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java @@ -45,7 +45,7 @@ public class SystemDataService { private SystemRoleDeptService systemRoleDeptService; /** - * 获取数据权限 -> TestPassed + * 查询数据权限 -> TestPassed * * @param user / * @return / @@ -54,7 +54,7 @@ public class SystemDataService { List deptIds = new ArrayList<>(); // 查询用户角色 Set roleList = systemUserRoleService.listUserRoleByUserId(user.getId()); - // 获取对应的部门ID + // 查询对应的部门ID for (SystemRoleTb role : roleList) { SystemDataScopeEnum dataScopeEnum = SystemDataScopeEnum.find(role.getDataScope()); switch (Objects.requireNonNull(dataScopeEnum)) { @@ -75,7 +75,7 @@ public class SystemDataService { } /** - * 获取自定义的数据权限 -> TestPassed + * 查询自定义的数据权限 -> TestPassed * * @param deptIds 部门ID（外部数据） * @param roleId 角色ID diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java index 37221ce4..c7b71484 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java @@ -100,7 +100,7 @@ public class SystemDeptService { } /** - * 根据部门id获取部门信息 -> TestPassed + * 根据部门id查询部门信息 -> TestPassed * * @param id 部门id * @return / @@ -116,7 +116,7 @@ public class SystemDeptService { */ @Transactional(rollbackFor = Exception.class) public void deleteDeptByIds(Set ids) { - // 获取部门, 和其所有子部门 + // 查询部门, 和其所有子部门 Set depts = this.traverseDeptByIdWithPids(ids); // 验证是否被角色或用户关联 this.verifyBindRelationByIds(depts); @@ -229,7 +229,7 @@ public class SystemDeptService { } /** - * 获取部门下所有关联的部门 + * 查询部门下所有关联的部门 * * @param deptTbList / * @param depts / @@ -263,7 +263,7 @@ public class SystemDeptService { } /** - * 根据ID获取同级与上级数据 + * 根据ID查询同级与上级数据 * * @param dept / * @param deptList / @@ -388,7 +388,7 @@ public class SystemDeptService { } private List buildDeptSelectOptions(List depts) { - // 获取所有部门并按父子关系组织 + // 查询所有部门并按父子关系组织 Map deptMap = depts.stream().collect(Collectors.toMap(SystemDeptTb::getId, Function.identity())); List options = new ArrayList<>(); @@ -433,7 +433,7 @@ public class SystemDeptService { public List listDeptSelectProDataSource() { List depts = this.listEnabledDepts(); - // 获取所有部门并按父子关系组织 + // 查询所有部门并按父子关系组织 Map deptMap = depts.stream().collect(Collectors.toMap(SystemDeptTb::getId, Function.identity())); List options = new ArrayList<>(); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java index 04cc2c0f..49571b5c 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java @@ -116,7 +116,7 @@ public class SystemDictDetailService { } /** - * 根据字典名称获取字典详情 -> TestPassed + * 根据字典名称查询字典详情 -> TestPassed * * @param name 字典名称 * @return / diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java index 3944c3de..23dab240 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java @@ -121,13 +121,17 @@ public class SystemJobService { } } + /** + * 根据岗位名称查询启用的岗位信息 -> TestPassed + */ public SystemJobTb getJobByName(String name) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemJobTb::getName, name); + wrapper.eq(SystemJobTb::getEnabled, 1); return systemJobMapper.selectOne(wrapper); } - public void injectQueryParams(SystemQueryJobArgs args, LambdaQueryWrapper wrapper) { + private void injectQueryParams(SystemQueryJobArgs args, LambdaQueryWrapper wrapper) { if (args != null) { wrapper.like(StrUtil.isNotBlank(args.getName()), SystemJobTb::getName, args.getName()); wrapper.eq(args.getEnabled() != null, SystemJobTb::getEnabled, args.getEnabled()); @@ -138,6 +142,9 @@ public class SystemJobService { wrapper.orderByDesc(SystemJobTb::getJobSort, SystemJobTb::getId); } + /** + * 导出岗位数据 -> TestPassed + */ public void exportJobXlsx(HttpServletResponse response, SystemQueryJobArgs args) { List systemJobTbs = this.queryJobByArgs(args); List rowVos = new ArrayList<>(); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index 3e0ab847..38dd0e40 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -212,7 +212,7 @@ public class SystemMenuService { } /** - * 根据当前用户获取菜单 + * 根据当前用户查询菜单 * * @param currentUserId / * @return / @@ -224,7 +224,7 @@ public class SystemMenuService { } /** - * 获取所有子节点, 包含自身ID + * 查询所有子节点, 包含自身ID * * @param menuList / * @param menuSet / @@ -261,7 +261,7 @@ public class SystemMenuService { } /** - * 根据ID获取同级与上级数据 + * 根据ID查询同级与上级数据 * * @param menu / * @param menus / @@ -355,7 +355,7 @@ public class SystemMenuService { } /** - * 获取 MenuResponse + * 查询 MenuResponse * * @param menu / * @param menuVo / diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java index 94901e13..f5bffc9e 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java @@ -75,7 +75,7 @@ public class SystemMonitorService { } /** - * 获取磁盘信息 + * 查询磁盘信息 * * @return / */ @@ -109,7 +109,7 @@ public class SystemMonitorService { } /** - * 获取交换区信息 + * 查询交换区信息 * * @param memory / * @return / @@ -131,7 +131,7 @@ public class SystemMonitorService { } /** - * 获取内存信息 + * 查询内存信息 * * @param memory / * @return / @@ -147,7 +147,7 @@ public class SystemMonitorService { } /** - * 获取Cpu相关信息 + * 查询Cpu相关信息 * * @param processor / * @return / @@ -194,7 +194,7 @@ public class SystemMonitorService { } /** - * 获取系统相关信息,系统、运行天数、系统IP + * 查询系统相关信息,系统、运行天数、系统IP * * @param os / * @return / diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java index a15314bb..89b1cf6d 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java @@ -182,10 +182,10 @@ public class SystemQuartzJobService { quartzJob.setUuid(uuid); // 执行任务 startQuartzJob(quartzJob); - // 获取执行状态, 如果执行失败则停止后面的子任务执行 + // 查询执行状态, 如果执行失败则停止后面的子任务执行 Boolean result = redisHelper.get(uuid, Boolean.class); while (result == null) { - // 休眠5秒, 再次获取子任务执行情况 + // 休眠5秒, 再次查询子任务执行情况 Thread.sleep(5000); result = redisHelper.get(uuid, Boolean.class); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 25bce45f..b6e23088 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -210,7 +210,7 @@ public class SystemRoleService { } /** - * 获取用户权限信息 -> TestPassed + * 查询用户权限信息 -> TestPassed * * @param user 用户信息 * @return 权限信息 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserDeptService.java index e051ae16..76580ef4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserDeptService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserDeptService.java @@ -13,6 +13,9 @@ public class SystemUserDeptService { @Autowired private SystemUserMapper systemUserMapper; + /** + * 根据部门id统计用户数量 -> TestPassed + */ public long countUserByDeptIds(Set deptIds) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(SystemUserTb::getDeptId, deptIds);