From 5a9dfcbe4d5a560e8dea63cb7a9429893e38d9a7 Mon Sep 17 00:00:00 2001 From: Odboy Date: Sat, 27 Dec 2025 22:14:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E9=87=8D=E6=9E=84=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemLocalStorageController.java | 6 +- .../controller/SystemMenuController.java | 14 ++-- .../controller/SystemMonitorController.java | 2 +- .../SystemOssStorageController.java | 4 +- .../controller/SystemQuartzJobController.java | 6 +- .../controller/SystemRoleController.java | 6 +- .../controller/SystemUserController.java | 4 +- .../system/dal/mysql/SystemDictMapper.java | 11 +++ .../framework/quartz/ActiveJobRegister.java | 2 +- .../system/service/SystemDataService.java | 2 +- .../service/SystemDictDetailService.java | 10 +-- .../system/service/SystemDictService.java | 10 --- .../service/SystemLocalStorageService.java | 31 +++----- .../system/service/SystemMenuService.java | 40 +++++------ .../system/service/SystemMonitorService.java | 2 +- .../service/SystemOssStorageService.java | 4 +- .../service/SystemQuartzJobService.java | 8 +-- .../system/service/SystemRoleDeptService.java | 2 +- .../system/service/SystemRoleMenuService.java | 3 +- .../system/service/SystemRoleService.java | 67 +++--------------- .../system/service/SystemUserService.java | 70 +------------------ .../impl/SystemOssStorageServiceImpl.java | 10 +-- 22 files changed, 88 insertions(+), 226 deletions(-) diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index acb98610..7e38470f 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -55,14 +55,14 @@ public class SystemLocalStorageController { @Validated @RequestBody KitPageArgs pageArgs) { SystemQueryStorageArgs args = pageArgs.getArgs(); Page page = new Page<>(args.getPage(), args.getSize()); - return ResponseEntity.ok(localStorageService.queryLocalStorage(args, page)); + return ResponseEntity.ok(localStorageService.searchLocalStorage(args, page)); } @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { - localStorageService.exportLocalStorageExcel(localStorageService.queryLocalStorage(args), response); + localStorageService.exportLocalStorageExcel(localStorageService.queryLocalStorageByArgs(args), response); } @ApiOperation("上传文件") @@ -96,7 +96,7 @@ public class SystemLocalStorageController { @ApiOperation("多选删除") @PostMapping(value = "/removeFileByIds") public ResponseEntity deleteFileByIds(@RequestBody Long[] ids) { - localStorageService.removeFileByIds(ids); + localStorageService.deleteFileByIds(ids); return ResponseEntity.ok(null); } } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index 5fd7fd1e..e05581cb 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -66,7 +66,7 @@ public class SystemMenuController { @PostMapping(value = "/buildMenus") @ApiOperation("获取前端所需菜单") public ResponseEntity> buildMenus() { - List menuList = systemMenuService.queryMenuListByUserId(KitSecurityHelper.getCurrentUserId()); + List menuList = systemMenuService.listMenuByUserId(KitSecurityHelper.getCurrentUserId()); List menus = systemMenuService.buildMenuTree(menuList); return ResponseEntity.ok(systemMenuService.buildMenuVo(menus)); } @@ -75,7 +75,7 @@ public class SystemMenuController { @PostMapping(value = "/queryMenuListByPid") @PreAuthorize("@el.check('menu:list','roles:list')") public ResponseEntity> queryMenuListByPid(@RequestParam Long pid) { - return ResponseEntity.ok(systemMenuService.queryMenuByPid(pid)); + return ResponseEntity.ok(systemMenuService.listMenuByPid(pid)); } @ApiOperation("根据菜单ID返回所有子节点ID, 包含自身ID") @@ -83,9 +83,9 @@ public class SystemMenuController { @PreAuthorize("@el.check('menu:list','roles:list')") public ResponseEntity> queryChildMenuSet(@RequestParam Long id) { Set menuSet = new HashSet<>(); - List menuList = systemMenuService.queryMenuByPid(id); + List menuList = systemMenuService.listMenuByPid(id); menuSet.add(systemMenuMapper.selectById(id)); - menuSet = systemMenuService.queryChildMenu(menuList, menuSet); + menuSet = systemMenuService.queryChildMenuByArgs(menuList, menuSet); Set ids = menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet()); return ResponseEntity.ok(ids); } @@ -116,7 +116,7 @@ public class SystemMenuController { if (CollectionUtil.isNotEmpty(ids)) { menus = new LinkedHashSet<>(systemMenuService.listMenuByIds(ids)); for (SystemMenuTb menu : menus) { - List menuList = systemMenuService.querySuperiorMenuList(menu, new ArrayList<>()); + List menuList = systemMenuService.querySuperiorMenuByArgs(menu, new ArrayList<>()); for (SystemMenuTb data : menuList) { if (data.getId().equals(menu.getPid())) { data.setSubCount(data.getSubCount() - 1); @@ -128,7 +128,7 @@ public class SystemMenuController { menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet()); return ResponseEntity.ok(systemMenuService.buildMenuTree(new ArrayList<>(menus))); } - return ResponseEntity.ok(systemMenuService.queryMenuByPid(null)); + return ResponseEntity.ok(systemMenuService.listMenuByPid(null)); } @ApiOperation("新增菜单") @@ -154,7 +154,7 @@ public class SystemMenuController { @PostMapping(value = "/removeMenuByIds") @PreAuthorize("@el.check('menu:del')") public ResponseEntity removeMenuByIds(@RequestBody Set ids) { - systemMenuService.removeMenuByIds(ids); + systemMenuService.deleteMenuByIds(ids); return ResponseEntity.ok(null); } } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java index 251872fb..b990e531 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java @@ -38,6 +38,6 @@ public class SystemMonitorController { @ApiOperation("查询服务监控") @PreAuthorize("@el.check('monitor:list')") public ResponseEntity> queryServerMonitorInfo() { - return ResponseEntity.ok(systemMonitorService.queryServerMonitorInfo()); + return ResponseEntity.ok(systemMonitorService.getServerMonitorInfo()); } } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java index c660b824..9f214d97 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java @@ -55,7 +55,7 @@ public class SystemOssStorageController { @Validated @RequestBody KitPageArgs pageArgs) { SystemQueryStorageArgs args = pageArgs.getArgs(); Page page = new Page<>(args.getPage(), args.getSize()); - return ResponseEntity.ok(systemOssStorageService.queryOssStorage(args, page)); + return ResponseEntity.ok(systemOssStorageService.searchOssStorage(args, page)); } @ApiOperation("导出数据") @@ -76,7 +76,7 @@ public class SystemOssStorageController { @ApiOperation("多选删除") @PostMapping(value = "/removeFileByIds") public ResponseEntity removeFileByIds(@RequestBody Long[] ids) { - systemOssStorageService.removeFileByIds(ids); + systemOssStorageService.deleteFileByIds(ids); return ResponseEntity.ok(null); } } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index f9241042..51dc185f 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -59,7 +59,7 @@ public class SystemQuartzJobController { @Validated @RequestBody KitPageArgs pageArgs) { SystemQueryQuartzJobArgs args = pageArgs.getArgs(); Page page = new Page<>(args.getPage(), args.getSize()); - return ResponseEntity.ok(systemQuartzJobService.queryQuartzJobByArgs(args, page)); + return ResponseEntity.ok(systemQuartzJobService.searchQuartzJobByArgs(args, page)); } @ApiOperation("导出任务数据") @@ -81,7 +81,7 @@ public class SystemQuartzJobController { @PreAuthorize("@el.check('quartzJob:list')") public ResponseEntity> queryQuartzJobLog(SystemQueryQuartzJobArgs args) { Page page = new Page<>(args.getPage(), args.getSize()); - return ResponseEntity.ok(systemQuartzJobService.queryQuartzLogByArgs(args, page)); + return ResponseEntity.ok(systemQuartzJobService.searchQuartzLogByArgs(args, page)); } @ApiOperation("新增定时任务") @@ -128,7 +128,7 @@ public class SystemQuartzJobController { @PostMapping(value = "/removeJobByIds") @PreAuthorize("@el.check('quartzJob:del')") public ResponseEntity removeJobByIds(@RequestBody Set ids) { - systemQuartzJobService.removeJobByIds(ids); + systemQuartzJobService.deleteJobByIds(ids); return ResponseEntity.ok(null); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index 3155b629..31ae76cf 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -70,7 +70,7 @@ public class SystemRoleController { @PostMapping(value = "/queryRoleList") @PreAuthorize("@el.check('roles:list','user:add','user:edit')") public ResponseEntity> queryRoleList() { - return ResponseEntity.ok(systemRoleService.queryAllRole()); + return ResponseEntity.ok(systemRoleService.listAllRole()); } @ApiOperation("查询角色") @@ -80,7 +80,7 @@ public class SystemRoleController { @Validated @RequestBody KitPageArgs pageArgs) { SystemQueryRoleArgs args = pageArgs.getArgs(); Page page = new Page<>(args.getPage(), args.getSize()); - return ResponseEntity.ok(systemRoleService.queryRoleByArgs(args, page)); + return ResponseEntity.ok(systemRoleService.searchRoleByArgs(args, page)); } @ApiOperation("获取用户级别") @@ -127,7 +127,7 @@ public class SystemRoleController { } // 验证是否被用户关联 systemRoleService.verifyBindRelationByIds(ids); - systemRoleService.removeRoleByIds(ids); + systemRoleService.deleteRoleByIds(ids); return ResponseEntity.ok(null); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index 403d2154..54e198cb 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java @@ -110,12 +110,12 @@ public class SystemUserController { // 取交集 args.getDeptIds().retainAll(dataScopes); if (!CollectionUtil.isEmpty(args.getDeptIds())) { - return ResponseEntity.ok(systemUserService.queryUserByArgs(args, page)); + return ResponseEntity.ok(systemUserService.searchUserByArgs(args, page)); } } else { // 否则取并集 args.getDeptIds().addAll(dataScopes); - return ResponseEntity.ok(systemUserService.queryUserByArgs(args, page)); + return ResponseEntity.ok(systemUserService.searchUserByArgs(args, page)); } return ResponseEntity.ok(KitPageUtil.emptyData()); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java index ee588fa5..93215a6e 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java @@ -16,7 +16,9 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemDictTb; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; import org.apache.ibatis.annotations.Mapper; /** @@ -27,4 +29,13 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemDictMapper extends BaseMapper { + default List listAll() { + return selectList(null); + } + + default SystemDictTb getByName(String dictName) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemDictTb::getName, dictName); + return selectOne(wrapper); + } } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java index 516d2d4f..0090bc30 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java @@ -40,7 +40,7 @@ public class ActiveJobRegister implements ApplicationRunner { */ @Override public void run(ApplicationArguments applicationArguments) { - List quartzJobs = systemQuartzJobService.queryEnableQuartzJob(); + List quartzJobs = systemQuartzJobService.listEnableQuartzJob(); quartzJobs.forEach(quartzManage::addJob); log.info("Timing task injection complete"); } 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 4c62538f..1d757f42 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 @@ -78,7 +78,7 @@ public class SystemDataService { * @return 数据权限ID */ private List queryCustomDataPermissionByArgs(List deptIds, SystemRoleTb role) { - List deptList = systemRoleDeptService.selectDeptByRoleId(role.getId()); + List deptList = systemRoleDeptService.listDeptByRoleId(role.getId()); for (SystemDeptTb dept : deptList) { deptIds.add(dept.getId()); List deptChildren = systemDeptService.listDeptByPid(dept.getId()); 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 7ef8d164..88234ee1 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 @@ -25,6 +25,7 @@ import cn.odboy.system.dal.model.SystemCreateDictDetailArgs; import cn.odboy.system.dal.model.SystemDictDetailVo; import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; import cn.odboy.system.dal.mysql.SystemDictDetailMapper; +import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitPageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -40,11 +41,10 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemDictDetailService { - @Autowired private SystemDictDetailMapper systemDictDetailMapper; @Autowired - private SystemDictService systemDictService; + private SystemDictMapper systemDictMapper; /** * 创建 @@ -115,14 +115,14 @@ public class SystemDictDetailService { List dictTbs = new ArrayList<>(); if (args == null) { - dictTbs.addAll(systemDictService.listAll()); + dictTbs.addAll(systemDictMapper.listAll()); dictIds = dictTbs.stream().map(SystemDictTb::getId).collect(Collectors.toList()); } else { String dictName = args.getDictName(); if (StrUtil.isBlank(dictName)) { return KitPageUtil.toPage(iPage); } - SystemDictTb dictTb = systemDictService.getByName(dictName); + SystemDictTb dictTb = systemDictMapper.getByName(dictName); if (dictTb == null) { return KitPageUtil.toPage(iPage); } else { @@ -150,7 +150,7 @@ public class SystemDictDetailService { if (StrUtil.isBlank(name)) { return new ArrayList<>(); } - SystemDictTb systemDictTb = systemDictService.getByName(name); + SystemDictTb systemDictTb = systemDictMapper.getByName(name); if (systemDictTb == null) { return new ArrayList<>(); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java index b50673fa..fafa0e92 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java @@ -144,14 +144,4 @@ public class SystemDictService { injectQueryParams(args, wrapper); return systemDictMapper.selectList(wrapper); } - - public SystemDictTb getByName(String name) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemDictTb::getName, name); - return systemDictMapper.selectOne(wrapper); - } - - public List listAll() { - return systemDictMapper.selectList(null); - } } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java index 41aa8f41..a5bf2bcd 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java @@ -30,7 +30,6 @@ import cn.odboy.system.dal.mysql.SystemLocalStorageMapper; import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitPageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.io.File; import java.io.IOException; @@ -111,7 +110,7 @@ public class SystemLocalStorageService { * @param ids / */ @Transactional(rollbackFor = Exception.class) - public void removeFileByIds(Long[] ids) { + public void deleteFileByIds(Long[] ids) { for (Long id : ids) { SystemLocalStorageTb storage = systemLocalStorageMapper.selectById(id); try { @@ -153,22 +152,15 @@ public class SystemLocalStorageService { * @param page 分页参数 * @return / */ - public KitPageResult queryLocalStorage(SystemQueryStorageArgs args, + public KitPageResult searchLocalStorage(SystemQueryStorageArgs args, Page page) { - return KitPageUtil.toPage(this.selectLocalStorageByArgs(args, page)); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + this.injectQueryParams(args, wrapper); + Page selectPage = systemLocalStorageMapper.selectPage(page, wrapper); + return KitPageUtil.toPage(selectPage); } - /** - * 查询全部数据 - * - * @param args 条件 - * @return / - */ - public List queryLocalStorage(SystemQueryStorageArgs args) { - return this.selectLocalStorageByArgs(args); - } - - public void injectQueryParams(SystemQueryStorageArgs args, LambdaQueryWrapper wrapper) { + private void injectQueryParams(SystemQueryStorageArgs args, LambdaQueryWrapper wrapper) { if (args != null) { wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemLocalStorageTb::getName, args.getBlurry()).or() @@ -183,16 +175,9 @@ public class SystemLocalStorageService { wrapper.orderByDesc(SystemLocalStorageTb::getId); } - public List selectLocalStorageByArgs(SystemQueryStorageArgs args) { + public List queryLocalStorageByArgs(SystemQueryStorageArgs args) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); this.injectQueryParams(args, wrapper); return systemLocalStorageMapper.selectList(wrapper); } - - public IPage selectLocalStorageByArgs(SystemQueryStorageArgs args, - Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - this.injectQueryParams(args, wrapper); - return systemLocalStorageMapper.selectPage(page, wrapper); - } } 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 700a8f9c..97a3e406 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 @@ -154,17 +154,17 @@ public class SystemMenuService { * 删除 */ @Transactional(rollbackFor = Exception.class) - public void removeMenuByIds(Set ids) { + public void deleteMenuByIds(Set ids) { Set menuSet = new HashSet<>(); for (Long id : ids) { - List menuList = this.queryMenuByPid(id); + List menuList = this.listMenuByPid(id); menuSet.add(systemMenuMapper.selectById(id)); - menuSet = this.queryChildMenu(menuList, menuSet); + menuSet = this.queryChildMenuByArgs(menuList, menuSet); } List menuIds = menuSet.stream().map(SystemMenuTb::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); if (CollUtil.isNotEmpty(menuIds)) { - KitSpringBeanHolder.getBean(SystemMenuService.class).removeRoleMenuByMenuIds(menuIds); + KitSpringBeanHolder.getBean(SystemMenuService.class).deleteRoleMenuByMenuIds(menuIds); systemMenuMapper.deleteByIds(menuIds); } for (SystemMenuTb menu : menuSet) { @@ -173,7 +173,7 @@ public class SystemMenuService { } @Transactional(rollbackFor = Exception.class) - public void removeRoleMenuByMenuIds(List menuIds) { + public void deleteRoleMenuByMenuIds(List menuIds) { if (CollUtil.isNotEmpty(menuIds)) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(SystemRoleMenuTb::getMenuId, menuIds); @@ -250,10 +250,10 @@ public class SystemMenuService { * @param currentUserId / * @return / */ - public List queryMenuListByUserId(Long currentUserId) { + public List listMenuByUserId(Long currentUserId) { List roles = systemRoleService.queryRoleByUsersId(currentUserId); Set roleIds = roles.stream().map(SystemRoleTb::getId).collect(Collectors.toSet()); - return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIdsAndType(roleIds, 2)); + return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIds(roleIds)); } /** @@ -263,12 +263,12 @@ public class SystemMenuService { * @param menuSet / * @return / */ - public Set queryChildMenu(List menuList, Set menuSet) { + public Set queryChildMenuByArgs(List menuList, Set menuSet) { for (SystemMenuTb menu : menuList) { menuSet.add(menu); - List menus = this.getMenuByPid(menu.getId()); + List menus = this.listMenuByPid(menu.getId()); if (CollUtil.isNotEmpty(menus)) { - queryChildMenu(menus, menuSet); + queryChildMenuByArgs(menus, menuSet); } } return menuSet; @@ -280,10 +280,13 @@ public class SystemMenuService { * @param pid / * @return / */ - public List queryMenuByPid(Long pid) { + public List listMenuByPid(Long pid) { List menus; if (pid != null && !pid.equals(0L)) { - menus = this.getMenuByPid(pid); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemMenuTb::getPid, pid); + wrapper.orderByAsc(SystemMenuTb::getMenuSort); + return systemMenuMapper.selectList(wrapper); } else { menus = this.listRootMenu(); } @@ -297,13 +300,13 @@ public class SystemMenuService { * @param menus / * @return / */ - public List querySuperiorMenuList(SystemMenuTb menu, List menus) { + public List querySuperiorMenuByArgs(SystemMenuTb menu, List menus) { if (menu.getPid() == null) { menus.addAll(this.listRootMenu()); return menus; } - menus.addAll(this.getMenuByPid(menu.getPid())); - return querySuperiorMenuList(systemMenuMapper.selectById(menu.getPid()), menus); + menus.addAll(this.listMenuByPid(menu.getPid())); + return querySuperiorMenuByArgs(systemMenuMapper.selectById(menu.getPid()), menus); } /** @@ -445,13 +448,6 @@ public class SystemMenuService { return systemMenuMapper.selectList(wrapper); } - private List getMenuByPid(Long pid) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemMenuTb::getPid, pid); - wrapper.orderByAsc(SystemMenuTb::getMenuSort); - return systemMenuMapper.selectList(wrapper); - } - private List listRootMenu() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.isNull(SystemMenuTb::getPid); 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 b15c1532..ce6e401e 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 @@ -51,7 +51,7 @@ public class SystemMonitorService { * * @return Map */ - public Map queryServerMonitorInfo() { + public Map getServerMonitorInfo() { Map resultMap = new LinkedHashMap<>(8); try { SystemInfo si = new SystemInfo(); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java index 3dfd6523..75569826 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java @@ -36,7 +36,7 @@ import org.springframework.web.multipart.MultipartFile; */ public interface SystemOssStorageService extends IService { - KitPageResult queryOssStorage(SystemQueryStorageArgs args, Page page); + KitPageResult searchOssStorage(SystemQueryStorageArgs args, Page page); List queryOssStorage(SystemQueryStorageArgs args); @@ -44,5 +44,5 @@ public interface SystemOssStorageService extends IService { String uploadFile(MultipartFile file); - void removeFileByIds(Long[] ids); + void deleteFileByIds(Long[] ids); } 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 1d350dee..67319e12 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 @@ -126,7 +126,7 @@ public class SystemQuartzJobService { * @param ids / */ @Transactional(rollbackFor = Exception.class) - public void removeJobByIds(Set ids) { + public void deleteJobByIds(Set ids) { for (Long id : ids) { SystemQuartzJobTb quartzJob = systemQuartzJobMapper.selectById(id); quartzManage.deleteJob(quartzJob); @@ -229,7 +229,7 @@ public class SystemQuartzJobService { * @param page 分页参数 * @return / */ - public KitPageResult queryQuartzJobByArgs(SystemQueryQuartzJobArgs args, + public KitPageResult searchQuartzJobByArgs(SystemQueryQuartzJobArgs args, Page page) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); this.injectQuartzJobQueryParams(args, wrapper); @@ -270,7 +270,7 @@ public class SystemQuartzJobService { * @param page 分页参数 * @return / */ - public KitPageResult queryQuartzLogByArgs(SystemQueryQuartzJobArgs args, + public KitPageResult searchQuartzLogByArgs(SystemQueryQuartzJobArgs args, Page page) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); this.injectQuartzLogQueryParams(args, wrapper); @@ -305,7 +305,7 @@ public class SystemQuartzJobService { return systemQuartzJobMapper.selectById(id); } - public List queryEnableQuartzJob() { + public List listEnableQuartzJob() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemQuartzJobTb::getIsPause, 0); return systemQuartzJobMapper.selectList(wrapper); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleDeptService.java index 53bf44c4..eee4ce81 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleDeptService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleDeptService.java @@ -66,7 +66,7 @@ public class SystemRoleDeptService { * @param roleId / * @return / */ - public List selectDeptByRoleId(Long roleId) { + public List listDeptByRoleId(Long roleId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemRoleDeptTb::getRoleId, roleId); List systemRoleDeptTbs = systemRoleDeptMapper.selectList(wrapper); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java index a0026224..a631f3ff 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java @@ -68,7 +68,7 @@ public class SystemRoleMenuService { } } - public LinkedHashSet queryMenuByRoleIdsAndType(Set roleIds, int menuType) { + public LinkedHashSet queryMenuByRoleIds(Set roleIds) { if (CollUtil.isEmpty(roleIds)) { return new LinkedHashSet<>(); } @@ -79,7 +79,6 @@ public class SystemRoleMenuService { if (CollUtil.isEmpty(menuIds)) { return new LinkedHashSet<>(); } - LambdaQueryWrapper menuWrapper = new LambdaQueryWrapper<>(); menuWrapper.in(SystemMenuTb::getId, menuIds); // 排除"按钮" 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 779024d0..7df90004 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 @@ -57,7 +57,6 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemRoleService { - @Autowired private SystemRoleMapper systemRoleMapper; @Autowired @@ -65,8 +64,6 @@ public class SystemRoleService { @Autowired private SystemRoleDeptService systemRoleDeptService; @Autowired - private SystemRoleMenuMapper systemRoleMenuMapper; - @Autowired private SystemRoleDeptMapper systemRoleDeptMapper; @Autowired private SystemUserRoleMapper systemUserRoleMapper; @@ -143,7 +140,7 @@ public class SystemRoleService { * @param ids / */ @Transactional(rollbackFor = Exception.class) - public void removeRoleByIds(Set ids) { + public void deleteRoleByIds(Set ids) { systemRoleMapper.deleteByIds(ids); // 删除角色部门关联数据、角色菜单关联数据 systemRoleDeptService.batchDeleteRoleDept(ids); @@ -172,14 +169,8 @@ public class SystemRoleService { /** * 查询全部角色 - * - * @return */ - public List queryAllRole() { - return this.selectAllRole(); - } - - private List selectAllRole() { + public List listAllRole() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.orderByAsc(SystemRoleTb::getLevel); return systemRoleMapper.selectList(wrapper); @@ -204,10 +195,8 @@ public class SystemRoleService { } } wrapper.orderByAsc(SystemRoleTb::getLevel); - - // 分页处理 - if (args != null && args.getOffset() > 0 && args.getSize() != null) { - Page rolePage = new Page<>(args.getOffset() / args.getSize() + 1, args.getSize()); + if (args != null && args.getSize() != null) { + Page rolePage = new Page<>(args.getPage(), args.getSize()); Page page = systemRoleMapper.selectPage(rolePage, wrapper); List roles = page.getRecords(); return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList()); @@ -224,7 +213,7 @@ public class SystemRoleService { * @param page 分页参数 * @return */ - public KitPageResult queryRoleByArgs(SystemQueryRoleArgs args, Page page) { + public KitPageResult searchRoleByArgs(SystemQueryRoleArgs args, Page page) { args.setOffset(page.offset()); List roles = this.queryRoleByArgs(args); Long total = this.countRoleByArgs(args); @@ -242,14 +231,11 @@ public class SystemRoleService { LambdaQueryWrapper userRoleWrapper = new LambdaQueryWrapper<>(); userRoleWrapper.eq(SystemUserRoleTb::getUserId, userId); List userRoles = systemUserRoleMapper.selectList(userRoleWrapper); - if (CollUtil.isEmpty(userRoles)) { return new ArrayList<>(); } - Set roleIds = userRoles.stream().map(SystemUserRoleTb::getRoleId).collect(Collectors.toSet()); List roles = systemRoleMapper.selectByIds(roleIds); - return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList()); } @@ -310,42 +296,6 @@ public class SystemRoleService { return systemRoleMapper.selectById(id); } - /** - * 根据ID查询角色详情（包含关联信息） - * - * @param id / - * @return / - */ - public SystemRoleVo getRoleVoById(Long id) { - SystemRoleTb role = systemRoleMapper.selectById(id); - if (role == null) { - return null; - } - return convertToRoleVo(role); - } - - /** - * 根据菜单ID查询角色 - * - * @param menuId 菜单ID - * @return / - */ - public List queryRoleByMenuId(Long menuId) { - // 查询包含该菜单的角色ID列表 - LambdaQueryWrapper roleMenuWrapper = new LambdaQueryWrapper<>(); - roleMenuWrapper.eq(SystemRoleMenuTb::getMenuId, menuId); - List roleMenuList = systemRoleMenuMapper.selectList(roleMenuWrapper); - - if (CollUtil.isEmpty(roleMenuList)) { - return new ArrayList<>(); - } - - Set roleIds = roleMenuList.stream().map(SystemRoleMenuTb::getRoleId).collect(Collectors.toSet()); - List roles = systemRoleMapper.selectByIds(roleIds); - - return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList()); - } - /** * 根据部门ID统计角色数量 * @@ -374,14 +324,13 @@ public class SystemRoleService { } SystemRoleVo roleVo = BeanUtil.copyProperties(role, SystemRoleVo.class); - // 查询关联的菜单信息 - Set menus = systemRoleMenuService.queryMenuByRoleIdsAndType( - Collections.singleton(role.getId()), -1); + Set menus = systemRoleMenuService.queryMenuByRoleIds( + Collections.singleton(role.getId())); roleVo.setMenus(menus); // 查询关联的部门信息 - List depts = systemRoleDeptService.selectDeptByRoleId(role.getId()); + List depts = systemRoleDeptService.listDeptByRoleId(role.getId()); roleVo.setDepts(new LinkedHashSet<>(depts)); return roleVo; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java index 6fae40b9..2aa9b7bf 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java @@ -306,15 +306,13 @@ public class SystemUserService { * @param page 分页参数 * @return / */ - public KitPageResult queryUserByArgs(SystemQueryUserArgs args, Page page) { + public KitPageResult searchUserByArgs(SystemQueryUserArgs args, Page page) { // 查询用户基本信息 LambdaQueryWrapper wrapper = buildUserQueryWrapper(args); IPage userPage = systemUserMapper.selectPage(page, wrapper); List users = userPage.getRecords(); - // 转换为SystemUserVo并关联查询 List userVos = users.stream().map(this::convertToUserVo).collect(Collectors.toList()); - return KitPageUtil.toPage(userVos, userPage.getTotal()); } @@ -328,7 +326,6 @@ public class SystemUserService { // 查询用户基本信息 LambdaQueryWrapper wrapper = buildUserQueryWrapper(args); List users = systemUserMapper.selectList(wrapper); - // 转换为SystemUserVo并关联查询 return users.stream().map(this::convertToUserVo).collect(Collectors.toList()); } @@ -366,57 +363,6 @@ public class SystemUserService { }).collect(Collectors.toList()); } - /** - * 根据角色ID查询用户 - * - * @param roleId 角色ID - * @return / - */ - public List selectUserByRoleId(Long roleId) { - // 查询用户角色关联 - LambdaQueryWrapper userRoleWrapper = new LambdaQueryWrapper<>(); - userRoleWrapper.eq(SystemUserRoleTb::getRoleId, roleId); - List userRoles = systemUserRoleMapper.selectList(userRoleWrapper); - - if (CollUtil.isEmpty(userRoles)) { - return new ArrayList<>(); - } - - Set userIds = userRoles.stream().map(SystemUserRoleTb::getUserId).collect(Collectors.toSet()); - List users = systemUserMapper.selectByIds(userIds); - - return users.stream().map(this::convertToUserVo).collect(Collectors.toList()); - } - - /** - * 根据部门ID查询用户 - * - * @param deptId 部门ID - * @return / - */ - public List selectUserByDeptId(Long deptId) { - // 查询部门关联的角色 - LambdaQueryWrapper userWrapper = new LambdaQueryWrapper<>(); - userWrapper.eq(SystemUserTb::getDeptId, deptId); - List users = systemUserMapper.selectList(userWrapper); - - return users.stream().map(this::convertToUserVo).collect(Collectors.toList()); - } - - /** - * 根据菜单ID查询用户 - * - * @param menuId 菜单ID - * @return / - */ - public List selectUserByMenuId(Long menuId) { - // 查询菜单角色关联 - LambdaQueryWrapper userRoleWrapper = new LambdaQueryWrapper<>(); - // 这里需要通过菜单角色关联表查询，暂时简化处理 - List users = systemUserMapper.selectList(null); - return users.stream().map(this::convertToUserVo).collect(Collectors.toList()); - } - /** * 根据岗位ID统计用户数量 * @@ -447,20 +393,6 @@ public class SystemUserService { return systemUserRoleMapper.selectCount(wrapper); } - /** - * 根据用户名查询用户详情（包含关联信息） - * - * @param username 用户名 - * @return / - */ - public SystemUserVo getUserVoByUsername(String username) { - SystemUserTb user = this.getUserByUsername(username); - if (user == null) { - return null; - } - return convertToUserVo(user); - } - /** * 构建用户查询条件 * diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java index 79a2e864..2a8fc92c 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java @@ -70,7 +70,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl queryOssStorage(SystemQueryStorageArgs args, + public KitPageResult searchOssStorage(SystemQueryStorageArgs args, Page page) { IPage ossStorageTbs = this.selectOssStorageByArgs(args, page); IPage convert = ossStorageTbs.convert(c -> { @@ -103,7 +103,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl queryOssStorage(SystemQueryStorageArgs args) { // 防止刷数据 Page page = new Page<>(1, 500); - return queryOssStorage(args, page).getContent(); + return searchOssStorage(args, page).getContent(); } @Override @@ -145,7 +145,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl