From 81f2e356f5ecf35be3b037eb50fae1903ae3fc5c Mon Sep 17 00:00:00 2001 From: Odboy Date: Sat, 21 Jun 2025 17:24:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SystemDeptController.java | 14 +++---- .../system/SystemDictController.java | 6 +-- .../system/SystemDictDetailController.java | 2 +- .../system/SystemEmailController.java | 6 +-- .../system/SystemJobController.java | 4 +- .../system/SystemLocalStorageController.java | 4 +- .../system/SystemMenuController.java | 38 +++++++++---------- .../system/SystemMonitorController.java | 6 +-- .../system/SystemOnlineController.java | 4 +- .../system/SystemQiniuController.java | 10 ++--- .../system/SystemQuartzJobController.java | 8 ++-- .../system/SystemRoleController.java | 24 ++++++------ .../system/SystemUserController.java | 28 +++++++------- .../dal/redis/system/SystemUserJwtApi.java | 2 +- .../redis/system/SystemUserJwtApiImpl.java | 2 +- .../dal/redis/system/SystemUserOnlineApi.java | 6 +-- .../redis/system/SystemUserOnlineApiImpl.java | 8 ++-- .../core/interfaces/CsMpEasyService.java | 24 ++++++------ .../core/interfaces/CsMpServiceImpl.java | 24 ++++++------ .../permission/core/handler/TokenFilter.java | 2 +- .../core/handler/UserDetailsHandler.java | 6 +-- .../service/system/SystemDataService.java | 2 +- .../service/system/SystemDataServiceImpl.java | 10 ++--- .../service/system/SystemDeptService.java | 14 +++---- .../service/system/SystemDeptServiceImpl.java | 30 +++++++-------- .../system/SystemDictDetailService.java | 2 +- .../system/SystemDictDetailServiceImpl.java | 2 +- .../service/system/SystemDictService.java | 4 +- .../service/system/SystemDictServiceImpl.java | 4 +- .../service/system/SystemEmailService.java | 2 +- .../system/SystemEmailServiceImpl.java | 6 +-- .../core/service/system/SystemJobService.java | 6 +-- .../service/system/SystemJobServiceImpl.java | 6 +-- .../system/SystemLocalStorageService.java | 4 +- .../system/SystemLocalStorageServiceImpl.java | 4 +- .../service/system/SystemMenuService.java | 12 +++--- .../service/system/SystemMenuServiceImpl.java | 18 ++++----- .../service/system/SystemMonitorService.java | 2 +- .../system/SystemMonitorServiceImpl.java | 2 +- .../system/SystemQiniuConfigService.java | 2 +- .../system/SystemQiniuConfigServiceImpl.java | 2 +- .../system/SystemQiniuContentService.java | 4 +- .../system/SystemQiniuContentServiceImpl.java | 12 +++--- .../system/SystemQuartzJobService.java | 8 ++-- .../system/SystemQuartzJobServiceImpl.java | 8 ++-- .../service/system/SystemRoleService.java | 14 +++---- .../service/system/SystemRoleServiceImpl.java | 16 ++++---- .../service/system/SystemUserService.java | 8 ++-- .../service/system/SystemUserServiceImpl.java | 8 ++-- 49 files changed, 220 insertions(+), 220 deletions(-) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDeptController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDeptController.java index 4f66d8f5..7cbfad93 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDeptController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDeptController.java @@ -30,25 +30,25 @@ public class SystemDeptController { @GetMapping(value = "/download") @PreAuthorize("@el.check('dept:list')") public void exportDept(HttpServletResponse response, QuerySystemDeptArgs criteria) throws Exception { - systemDeptService.downloadDeptExcel(systemDeptService.describeDeptList(criteria, false), response); + systemDeptService.downloadDeptExcel(systemDeptService.queryDeptList(criteria, false), response); } @ApiOperation("查询部门") @GetMapping @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity>> describeDeptPage(QuerySystemDeptArgs criteria) throws Exception { - List depts = systemDeptService.describeDeptList(criteria, true); + public ResponseEntity>> queryDeptPage(QuerySystemDeptArgs criteria) throws Exception { + List depts = systemDeptService.queryDeptList(criteria, true); return new ResponseEntity<>(PageUtil.toPage(depts), HttpStatus.OK); } @ApiOperation("查询部门:根据ID获取同级与上级数据") - @PostMapping("/describeDeptSuperiorTree") + @PostMapping("/queryDeptSuperiorTree") @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity describeDeptSuperiorTree(@RequestBody List ids, @RequestParam(defaultValue = "false") Boolean exclude) { + public ResponseEntity queryDeptSuperiorTree(@RequestBody List ids, @RequestParam(defaultValue = "false") Boolean exclude) { Set deptSet = new LinkedHashSet<>(); for (Long id : ids) { - SystemDeptTb dept = systemDeptService.describeDeptById(id); - List depts = systemDeptService.describeSuperiorDeptListByPid(dept, new ArrayList<>()); + SystemDeptTb dept = systemDeptService.queryDeptById(id); + List depts = systemDeptService.querySuperiorDeptListByPid(dept, new ArrayList<>()); if (exclude) { for (SystemDeptTb data : depts) { if (data.getId().equals(dept.getPid())) { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictController.java index 0fb7d169..70fe81c5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictController.java @@ -31,14 +31,14 @@ public class SystemDictController { @GetMapping(value = "/download") @PreAuthorize("@el.check('dict:list')") public void exportDict(HttpServletResponse response, QuerySystemDictArgs criteria) throws IOException { - systemDictService.downloadDictExcel(systemDictService.describeDictList(criteria), response); + systemDictService.downloadDictExcel(systemDictService.queryDictList(criteria), response); } @ApiOperation("查询字典") @PostMapping(value = "/queryAllDict") @PreAuthorize("@el.check('dict:list')") public ResponseEntity> queryAllDict() { - return new ResponseEntity<>(systemDictService.describeDictList(new QuerySystemDictArgs()), HttpStatus.OK); + return new ResponseEntity<>(systemDictService.queryDictList(new QuerySystemDictArgs()), HttpStatus.OK); } @ApiOperation("查询字典") @@ -46,7 +46,7 @@ public class SystemDictController { @PreAuthorize("@el.check('dict:list')") public ResponseEntity>> queryDict(QuerySystemDictArgs criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(systemDictService.describeDictPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(systemDictService.queryDictPage(criteria, page), HttpStatus.OK); } @ApiOperation("新增字典") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictDetailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictDetailController.java index 1057a2b6..a06e4931 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictDetailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictDetailController.java @@ -39,7 +39,7 @@ public class SystemDictDetailController { String[] names = dictName.split("[,，]"); Map> dictMap = new HashMap<>(16); for (String name : names) { - dictMap.put(name, systemDictDetailService.describeDictDetailListByName(name)); + dictMap.put(name, systemDictDetailService.queryDictDetailListByName(name)); } return new ResponseEntity<>(dictMap, HttpStatus.OK); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemEmailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemEmailController.java index 8e3c49ff..3d4e0685 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemEmailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemEmailController.java @@ -25,9 +25,9 @@ public class SystemEmailController { private final SystemEmailService systemEmailService; @ApiOperation("查询配置") - @PostMapping(value = "/describeEmailConfig") - public ResponseEntity describeEmailConfig() { - return new ResponseEntity<>(systemEmailService.describeEmailConfig(), HttpStatus.OK); + @PostMapping(value = "/queryEmailConfig") + public ResponseEntity queryEmailConfig() { + return new ResponseEntity<>(systemEmailService.queryEmailConfig(), HttpStatus.OK); } @ApiOperation("配置邮件") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemJobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemJobController.java index ecf69120..9d545c7e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemJobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemJobController.java @@ -32,7 +32,7 @@ public class SystemJobController { @GetMapping(value = "/download") @PreAuthorize("@el.check('job:list')") public void exportJob(HttpServletResponse response, QuerySystemJobArgs criteria) throws IOException { - systemJobService.downloadJobExcel(systemJobService.describeJobList(criteria), response); + systemJobService.downloadJobExcel(systemJobService.queryJobList(criteria), response); } @ApiOperation("查询岗位") @@ -40,7 +40,7 @@ public class SystemJobController { @PreAuthorize("@el.check('job:list','user:list')") public ResponseEntity>> queryJob(QuerySystemJobArgs criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(systemJobService.describeJobPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(systemJobService.queryJobPage(criteria, page), HttpStatus.OK); } @ApiOperation("新增岗位") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemLocalStorageController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemLocalStorageController.java index abb7bc90..e296762e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemLocalStorageController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemLocalStorageController.java @@ -34,14 +34,14 @@ public class SystemLocalStorageController { @PreAuthorize("@el.check('storage:list')") public ResponseEntity>> queryFile(QuerySystemLocalStorageArgs criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(localStorageService.describeLocalStoragePage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(localStorageService.queryLocalStoragePage(criteria, page), HttpStatus.OK); } @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") public void exportFile(HttpServletResponse response, QuerySystemLocalStorageArgs criteria) throws IOException { - localStorageService.downloadExcel(localStorageService.describeLocalStorageList(criteria), response); + localStorageService.downloadExcel(localStorageService.queryLocalStorageList(criteria), response); } @ApiOperation("上传文件") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMenuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMenuController.java index d63223ad..1793d337 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMenuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMenuController.java @@ -35,32 +35,32 @@ public class SystemMenuController { @GetMapping(value = "/download") @PreAuthorize("@el.check('menu:list')") public void exportMenu(HttpServletResponse response, QuerySystemMenuArgs criteria) throws Exception { - systemMenuService.downloadMenuExcel(systemMenuService.describeMenuList(criteria, false), response); + systemMenuService.downloadMenuExcel(systemMenuService.queryMenuList(criteria, false), response); } @PostMapping(value = "/buildMenus") @ApiOperation("获取前端所需菜单") public ResponseEntity> buildMenus() { - List menuList = systemMenuService.describeMenuListByUserId(SecurityHelper.getCurrentUserId()); + List menuList = systemMenuService.queryMenuListByUserId(SecurityHelper.getCurrentUserId()); List menus = systemMenuService.buildMenuTree(menuList); return new ResponseEntity<>(systemMenuService.buildMenuVo(menus), HttpStatus.OK); } @ApiOperation("返回全部的菜单") - @PostMapping(value = "/describeMenuListByPid") + @PostMapping(value = "/queryMenuListByPid") @PreAuthorize("@el.check('menu:list','roles:list')") - public ResponseEntity> describeMenuListByPid(@RequestParam Long pid) { - return new ResponseEntity<>(systemMenuService.describeMenuListByPid(pid), HttpStatus.OK); + public ResponseEntity> queryMenuListByPid(@RequestParam Long pid) { + return new ResponseEntity<>(systemMenuService.queryMenuListByPid(pid), HttpStatus.OK); } @ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID") - @PostMapping(value = "/describeChildMenuSet") + @PostMapping(value = "/queryChildMenuSet") @PreAuthorize("@el.check('menu:list','roles:list')") - public ResponseEntity describeChildMenuSet(@RequestParam Long id) { + public ResponseEntity queryChildMenuSet(@RequestParam Long id) { Set menuSet = new HashSet<>(); - List menuList = systemMenuService.describeMenuListByPid(id); - menuSet.add(systemMenuService.describeMenuById(id)); - menuSet = systemMenuService.describeChildMenuSet(menuList, menuSet); + List menuList = systemMenuService.queryMenuListByPid(id); + menuSet.add(systemMenuService.queryMenuById(id)); + menuSet = systemMenuService.queryChildMenuSet(menuList, menuSet); Set ids = menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet()); return new ResponseEntity<>(ids, HttpStatus.OK); } @@ -69,19 +69,19 @@ public class SystemMenuController { @ApiOperation("查询菜单") @PreAuthorize("@el.check('menu:list')") public ResponseEntity>> queryMenu(QuerySystemMenuArgs criteria) throws Exception { - List menuList = systemMenuService.describeMenuList(criteria, true); + List menuList = systemMenuService.queryMenuList(criteria, true); return new ResponseEntity<>(PageUtil.toPage(menuList), HttpStatus.OK); } @ApiOperation("查询菜单:根据ID获取同级与上级数据") - @PostMapping("/describeMenuSuperior") + @PostMapping("/queryMenuSuperior") @PreAuthorize("@el.check('menu:list')") - public ResponseEntity> describeMenuSuperior(@RequestBody List ids) { + public ResponseEntity> queryMenuSuperior(@RequestBody List ids) { Set menus = new LinkedHashSet<>(); if (CollectionUtil.isNotEmpty(ids)) { for (Long id : ids) { - SystemMenuTb menu = systemMenuService.describeMenuById(id); - List menuList = systemMenuService.describeSuperiorMenuList(menu, new ArrayList<>()); + SystemMenuTb menu = systemMenuService.queryMenuById(id); + List menuList = systemMenuService.querySuperiorMenuList(menu, new ArrayList<>()); for (SystemMenuTb data : menuList) { if (data.getId().equals(menu.getPid())) { data.setSubCount(data.getSubCount() - 1); @@ -93,7 +93,7 @@ public class SystemMenuController { menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet()); return new ResponseEntity<>(systemMenuService.buildMenuTree(new ArrayList<>(menus)), HttpStatus.OK); } - return new ResponseEntity<>(systemMenuService.describeMenuListByPid(null), HttpStatus.OK); + return new ResponseEntity<>(systemMenuService.queryMenuListByPid(null), HttpStatus.OK); } @ApiOperation("新增菜单") @@ -121,9 +121,9 @@ public class SystemMenuController { public ResponseEntity removeMenuByIds(@RequestBody Set ids) { Set menuSet = new HashSet<>(); for (Long id : ids) { - List menuList = systemMenuService.describeMenuListByPid(id); - menuSet.add(systemMenuService.describeMenuById(id)); - menuSet = systemMenuService.describeChildMenuSet(menuList, menuSet); + List menuList = systemMenuService.queryMenuListByPid(id); + menuSet.add(systemMenuService.queryMenuById(id)); + menuSet = systemMenuService.queryChildMenuSet(menuList, menuSet); } systemMenuService.removeMenuByIds(menuSet); return new ResponseEntity<>(HttpStatus.OK); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMonitorController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMonitorController.java index 6931ff69..b0829cfe 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMonitorController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMonitorController.java @@ -19,10 +19,10 @@ public class SystemMonitorController { private final SystemMonitorService serverService; - @PostMapping(value = "/describeServerMonitorInfo") + @PostMapping(value = "/queryServerMonitorInfo") @ApiOperation("查询服务监控") @PreAuthorize("@el.check('monitor:list')") - public ResponseEntity describeServerMonitorInfo() { - return new ResponseEntity<>(serverService.describeServerMonitorInfo(), HttpStatus.OK); + public ResponseEntity queryServerMonitorInfo() { + return new ResponseEntity<>(serverService.queryServerMonitorInfo(), HttpStatus.OK); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemOnlineController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemOnlineController.java index ecbdff84..a87cc9fd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemOnlineController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemOnlineController.java @@ -32,14 +32,14 @@ public class SystemOnlineController { @GetMapping @PreAuthorize("@el.check()") public ResponseEntity>> queryOnlineUser(String username, Pageable pageable) { - return new ResponseEntity<>(systemUserOnlineApi.describeUserOnlineModelPage(username, pageable), HttpStatus.OK); + return new ResponseEntity<>(systemUserOnlineApi.queryUserOnlineModelPage(username, pageable), HttpStatus.OK); } @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check()") public void exportOnlineUser(HttpServletResponse response, String username) throws IOException { - systemUserOnlineService.downloadUserOnlineModelExcel(systemUserOnlineApi.describeUserOnlineModelListByUsername(username), response); + systemUserOnlineService.downloadUserOnlineModelExcel(systemUserOnlineApi.queryUserOnlineModelListByUsername(username), response); } @ApiOperation("踢出用户") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQiniuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQiniuController.java index b658e40c..91e5c2b9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQiniuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQiniuController.java @@ -36,9 +36,9 @@ public class SystemQiniuController { private final SystemQiniuConfigService qiNiuConfigService; @ApiOperation("查询七牛云存储配置") - @PostMapping(value = "/describeQiniuConfig") - public ResponseEntity describeQiniuConfig() { - return new ResponseEntity<>(qiNiuConfigService.describeQiniuConfig(), HttpStatus.OK); + @PostMapping(value = "/queryQiniuConfig") + public ResponseEntity queryQiniuConfig() { + return new ResponseEntity<>(qiNiuConfigService.queryQiniuConfig(), HttpStatus.OK); } @ApiOperation("配置七牛云存储") @@ -52,14 +52,14 @@ public class SystemQiniuController { @ApiOperation("导出数据") @GetMapping(value = "/download") public void exportQiNiu(HttpServletResponse response, QuerySystemQiniuArgs criteria) throws IOException { - qiniuContentService.downloadExcel(qiniuContentService.describeQiniuContentList(criteria), response); + qiniuContentService.downloadExcel(qiniuContentService.queryQiniuContentList(criteria), response); } @ApiOperation("查询文件") @GetMapping public ResponseEntity>> queryQiNiu(QuerySystemQiniuArgs criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(qiniuContentService.describeQiniuContentPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(qiniuContentService.queryQiniuContentPage(criteria, page), HttpStatus.OK); } @ApiOperation("上传文件") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQuartzJobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQuartzJobController.java index 2c101013..88891a6b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQuartzJobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQuartzJobController.java @@ -39,21 +39,21 @@ public class SystemQuartzJobController { @PreAuthorize("@el.check('timing:list')") public ResponseEntity>> queryQuartzJob(QuerySystemQuartzJobArgs criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(systemQuartzJobService.describeQuartzJobPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(systemQuartzJobService.queryQuartzJobPage(criteria, page), HttpStatus.OK); } @ApiOperation("导出任务数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('timing:list')") public void exportQuartzJob(HttpServletResponse response, QuerySystemQuartzJobArgs criteria) throws IOException { - systemQuartzJobService.downloadQuartzJobExcel(systemQuartzJobService.describeQuartzJobList(criteria), response); + systemQuartzJobService.downloadQuartzJobExcel(systemQuartzJobService.queryQuartzJobList(criteria), response); } @ApiOperation("导出日志数据") @GetMapping(value = "/logs/download") @PreAuthorize("@el.check('timing:list')") public void exportQuartzJobLog(HttpServletResponse response, QuerySystemQuartzJobArgs criteria) throws IOException { - systemQuartzJobService.downloadQuartzLogExcel(systemQuartzJobService.describeQuartzLogList(criteria), response); + systemQuartzJobService.downloadQuartzLogExcel(systemQuartzJobService.queryQuartzLogList(criteria), response); } @ApiOperation("查询任务执行日志") @@ -61,7 +61,7 @@ public class SystemQuartzJobController { @PreAuthorize("@el.check('timing:list')") public ResponseEntity>> queryQuartzJobLog(QuerySystemQuartzJobArgs criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(systemQuartzJobService.describeQuartzLogPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(systemQuartzJobService.queryQuartzLogPage(criteria, page), HttpStatus.OK); } @ApiOperation("新增定时任务") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemRoleController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemRoleController.java index 3409891b..9497e75c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemRoleController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemRoleController.java @@ -34,37 +34,37 @@ public class SystemRoleController { private final SystemRoleService systemRoleService; @ApiOperation("获取单个role") - @PostMapping(value = "/describeRoleById") + @PostMapping(value = "/queryRoleById") @PreAuthorize("@el.check('roles:list')") - public ResponseEntity describeRoleById(@RequestBody SystemRoleTb args) { - return new ResponseEntity<>(systemRoleService.describeRoleById(args.getId()), HttpStatus.OK); + public ResponseEntity queryRoleById(@RequestBody SystemRoleTb args) { + return new ResponseEntity<>(systemRoleService.queryRoleById(args.getId()), HttpStatus.OK); } @ApiOperation("导出角色数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('role:list')") public void exportRole(HttpServletResponse response, QuerySystemRoleArgs criteria) throws IOException { - systemRoleService.downloadRoleExcel(systemRoleService.describeRoleList(criteria), response); + systemRoleService.downloadRoleExcel(systemRoleService.queryRoleList(criteria), response); } @ApiOperation("返回全部的角色") - @PostMapping(value = "/describeRoleList") + @PostMapping(value = "/queryRoleList") @PreAuthorize("@el.check('roles:list','user:add','user:edit')") - public ResponseEntity> describeRoleList() { - return new ResponseEntity<>(systemRoleService.describeRoleList(), HttpStatus.OK); + public ResponseEntity> queryRoleList() { + return new ResponseEntity<>(systemRoleService.queryRoleList(), HttpStatus.OK); } @ApiOperation("查询角色") @GetMapping @PreAuthorize("@el.check('roles:list')") - public ResponseEntity>> describeRolePage(QuerySystemRoleArgs criteria) { + public ResponseEntity>> queryRolePage(QuerySystemRoleArgs criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(systemRoleService.describeRolePage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(systemRoleService.queryRolePage(criteria, page), HttpStatus.OK); } @ApiOperation("获取用户级别") - @PostMapping(value = "/describeRoleLevel") - public ResponseEntity describeRoleLevel() { + @PostMapping(value = "/queryRoleLevel") + public ResponseEntity queryRoleLevel() { return new ResponseEntity<>(Dict.create().set("level", checkRoleLevels(null)), HttpStatus.OK); } @@ -116,7 +116,7 @@ public class SystemRoleController { * @return / */ private int checkRoleLevels(Integer level) { - List levels = systemRoleService.describeRoleListByUsersId(SecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()); + List levels = systemRoleService.queryRoleListByUsersId(SecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()); int min = Collections.min(levels); if (level != null) { if (level < min) { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemUserController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemUserController.java index f2301649..d36872d9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemUserController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemUserController.java @@ -54,7 +54,7 @@ public class SystemUserController { @GetMapping(value = "/download") @PreAuthorize("@el.check('user:list')") public void downloadUserExcel(HttpServletResponse response, QuerySystemUserArgs criteria) throws IOException { - systemUserService.downloadUserExcel(systemUserService.describeUserList(criteria), response); + systemUserService.downloadUserExcel(systemUserService.queryUserList(criteria), response); } @ApiOperation("查询用户") @@ -65,23 +65,23 @@ public class SystemUserController { if (!ObjectUtils.isEmpty(criteria.getDeptId())) { criteria.getDeptIds().add(criteria.getDeptId()); // 先查找是否存在子节点 - List data = systemDeptService.describeDeptListByPid(criteria.getDeptId()); + List data = systemDeptService.queryDeptListByPid(criteria.getDeptId()); // 然后把子节点的ID都加入到集合中 - criteria.getDeptIds().addAll(systemDeptService.describeChildDeptIdListByDeptIds(data)); + criteria.getDeptIds().addAll(systemDeptService.queryChildDeptIdListByDeptIds(data)); } // 数据权限 - List dataScopes = systemDataService.describeDeptIdListByUserIdWithDeptId(systemUserService.describeUserByUsername(SecurityHelper.getCurrentUsername())); + List dataScopes = systemDataService.queryDeptIdListByUserIdWithDeptId(systemUserService.queryUserByUsername(SecurityHelper.getCurrentUsername())); // criteria.getDeptIds() 不为空并且数据权限不为空则取交集 if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)) { // 取交集 criteria.getDeptIds().retainAll(dataScopes); if (!CollectionUtil.isEmpty(criteria.getDeptIds())) { - return new ResponseEntity<>(systemUserService.describeUserPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(systemUserService.queryUserPage(criteria, page), HttpStatus.OK); } } else { // 否则取并集 criteria.getDeptIds().addAll(dataScopes); - return new ResponseEntity<>(systemUserService.describeUserPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(systemUserService.queryUserPage(criteria, page), HttpStatus.OK); } return new ResponseEntity<>(PageUtil.emptyData(), HttpStatus.OK); } @@ -121,10 +121,10 @@ public class SystemUserController { @PreAuthorize("@el.check('user:del')") public ResponseEntity removeUserByIds(@RequestBody Set ids) { for (Long id : ids) { - Integer currentLevel = Collections.min(systemRoleService.describeRoleListByUsersId(SecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList())); - Integer optLevel = Collections.min(systemRoleService.describeRoleListByUsersId(id).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList())); + Integer currentLevel = Collections.min(systemRoleService.queryRoleListByUsersId(SecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList())); + Integer optLevel = Collections.min(systemRoleService.queryRoleListByUsersId(id).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList())); if (currentLevel > optLevel) { - throw new BadRequestException("角色权限不足，不能删除：" + systemUserService.describeUserById(id).getUsername()); + throw new BadRequestException("角色权限不足，不能删除：" + systemUserService.queryUserById(id).getUsername()); } } systemUserService.removeUserByIds(ids); @@ -136,7 +136,7 @@ public class SystemUserController { public ResponseEntity modifyUserPasswordByUsername(@RequestBody UpdateSystemUserPasswordArgs passVo) throws Exception { String oldPass = RsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), passVo.getOldPass()); String newPass = RsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), passVo.getNewPass()); - SystemUserTb user = systemUserService.describeUserByUsername(SecurityHelper.getCurrentUsername()); + SystemUserTb user = systemUserService.queryUserByUsername(SecurityHelper.getCurrentUsername()); if (!passwordEncoder.matches(oldPass, user.getPassword())) { throw new BadRequestException("修改失败，旧密码错误"); } @@ -165,7 +165,7 @@ public class SystemUserController { @PostMapping(value = "/modifyUserEmailByUsername/{code}") public ResponseEntity modifyUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb resources) throws Exception { String password = RsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), resources.getPassword()); - SystemUserTb user = systemUserService.describeUserByUsername(SecurityHelper.getCurrentUsername()); + SystemUserTb user = systemUserService.queryUserByUsername(SecurityHelper.getCurrentUsername()); if (!passwordEncoder.matches(password, user.getPassword())) { throw new BadRequestException("密码错误"); } @@ -180,15 +180,15 @@ public class SystemUserController { * @param resources / */ private void checkLevel(SystemUserTb resources) { - Integer currentLevel = Collections.min(systemRoleService.describeRoleListByUsersId(SecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList())); - Integer optLevel = systemRoleService.describeDeptLevelByRoles(resources.getRoles()); + Integer currentLevel = Collections.min(systemRoleService.queryRoleListByUsersId(SecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList())); + Integer optLevel = systemRoleService.queryDeptLevelByRoles(resources.getRoles()); if (currentLevel > optLevel) { throw new BadRequestException("角色权限不足"); } } @ApiOperation("查询用户基础数据") - @PostMapping(value = "/describeUserMetadataOptions") + @PostMapping(value = "/queryUserMetadataOptions") @PreAuthorize("@el.check('user:list')") public ResponseEntity> queryUserMetadataOptions(@Validated @RequestBody QuerySystemUserArgs criteria) { int maxPageSize = 50; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserJwtApi.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserJwtApi.java index 8fa53509..c47c7b1b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserJwtApi.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserJwtApi.java @@ -10,5 +10,5 @@ public interface SystemUserJwtApi { * @param username 用户名 * @return UserJwtVo */ - SystemUserJwtVo describeUserJwtModelByUsername(String username); + SystemUserJwtVo queryUserJwtModelByUsername(String username); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserJwtApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserJwtApiImpl.java index b6517cbf..a38bbbf5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserJwtApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserJwtApiImpl.java @@ -15,7 +15,7 @@ public class SystemUserJwtApiImpl implements SystemUserJwtApi { private RedisHelper redisHelper; @Override - public SystemUserJwtVo describeUserJwtModelByUsername(String username) { + public SystemUserJwtVo queryUserJwtModelByUsername(String username) { // 转小写 username = StringUtil.lowerCase(username); if (StringUtil.isNotEmpty(username)) { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineApi.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineApi.java index 868dc553..6d84197a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineApi.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineApi.java @@ -15,7 +15,7 @@ public interface SystemUserOnlineApi { * @param pageable / * @return / */ - CsResultVo> describeUserOnlineModelPage(String username, Pageable pageable); + CsResultVo> queryUserOnlineModelPage(String username, Pageable pageable); /** * 查询全部数据，不分页 @@ -23,7 +23,7 @@ public interface SystemUserOnlineApi { * @param username / * @return / */ - List describeUserOnlineModelListByUsername(String username); + List queryUserOnlineModelListByUsername(String username); /** * 查询用户 @@ -31,5 +31,5 @@ public interface SystemUserOnlineApi { * @param key / * @return / */ - SystemUserOnlineVo describeUserOnlineModelByKey(String key); + SystemUserOnlineVo queryUserOnlineModelByKey(String key); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineApiImpl.java index dd4e6b56..2089cc07 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineApiImpl.java @@ -21,14 +21,14 @@ public class SystemUserOnlineApiImpl implements SystemUserOnlineApi { private final RedisHelper redisHelper; @Override - public CsResultVo> describeUserOnlineModelPage(String username, Pageable pageable) { - List onlineUserList = describeUserOnlineModelListByUsername(username); + public CsResultVo> queryUserOnlineModelPage(String username, Pageable pageable) { + List onlineUserList = queryUserOnlineModelListByUsername(username); List paging = PageUtil.softPaging(pageable.getPageNumber(), pageable.getPageSize(), onlineUserList); return PageUtil.toPage(paging, onlineUserList.size()); } @Override - public List describeUserOnlineModelListByUsername(String username) { + public List queryUserOnlineModelListByUsername(String username) { String loginKey = SystemRedisKey.ONLINE_USER + (StringUtil.isBlank(username) ? "" : "*" + username); List keys = redisHelper.scan(loginKey + "*"); Collections.reverse(keys); @@ -41,7 +41,7 @@ public class SystemUserOnlineApiImpl implements SystemUserOnlineApi { } @Override - public SystemUserOnlineVo describeUserOnlineModelByKey(String key) { + public SystemUserOnlineVo queryUserOnlineModelByKey(String key) { return redisHelper.get(key, SystemUserOnlineVo.class); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpEasyService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpEasyService.java index 1c649c18..905a2490 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpEasyService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpEasyService.java @@ -40,29 +40,29 @@ public interface CsMpEasyService extends IService { boolean modifyFeatureClazzListById(Collection resources, int batchSize); - G describeFeatureClazzById(Serializable id, Class targetClazz); + G queryFeatureClazzById(Serializable id, Class targetClazz); - T describeClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn); + T queryClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn); - G describeFeatureClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn, Class clazz); + G queryFeatureClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn, Class clazz); - List describeFeatureClazzListByIds(List ids, Class targetClazz); + List queryFeatureClazzListByIds(List ids, Class targetClazz); - List describeClazzListByArgs(Q criteria); + List queryClazzListByArgs(Q criteria); - List describeClazzListByArgs(LambdaQueryWrapper wrapper); + List queryClazzListByArgs(LambdaQueryWrapper wrapper); - List describeFeatureClazzListByArgs(Q criteria, Class targetClazz); + List queryFeatureClazzListByArgs(Q criteria, Class targetClazz); - List describeFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz); + List queryFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz); - CsResultVo> describeClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable); + CsResultVo> queryClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable); - CsResultVo> describeFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz); + CsResultVo> queryFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz); - CsResultVo> describeFeatureClazzPageByArgs(Q criteria, IPage pageable, Class targetClazz); + CsResultVo> queryFeatureClazzPageByArgs(Q criteria, IPage pageable, Class targetClazz); - CsResultVo> describeClazzPageByArgs(Q criteria, IPage pageable); + CsResultVo> queryClazzPageByArgs(Q criteria, IPage pageable); int modifyClazzByArgs(LambdaQueryWrapper wrapper, T entity); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java index 1eb53161..f028dacc 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java @@ -87,7 +87,7 @@ public class CsMpServiceImpl, T> extends ServiceImpl G describeFeatureClazzById(Serializable id, Class targetClazz) { + public G queryFeatureClazzById(Serializable id, Class targetClazz) { T entity = this.getById(id); return entity == null ? null : BeanUtil.copyProperties(entity, targetClazz); } @@ -97,7 +97,7 @@ public class CsMpServiceImpl, T> extends ServiceImpl wrapper, SFunction orderColumn) { + public T queryClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn) { if (orderColumn == null) { throw new BadRequestException("参数orderColumn(排序的列)必填"); } @@ -113,7 +113,7 @@ public class CsMpServiceImpl, T> extends ServiceImpl G describeFeatureClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn, Class clazz) { + public G queryFeatureClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn, Class clazz) { if (orderColumn == null) { throw new BadRequestException("参数orderColumn(排序的列)必填"); } @@ -135,7 +135,7 @@ public class CsMpServiceImpl, T> extends ServiceImpl List describeFeatureClazzListByIds(List ids, Class targetClazz) { + public List queryFeatureClazzListByIds(List ids, Class targetClazz) { List entitys = this.listByIds(ids); return entitys == null || entitys.isEmpty() ? CollUtil.newArrayList() : BeanUtil.copyToList(entitys, targetClazz); } @@ -145,7 +145,7 @@ public class CsMpServiceImpl, T> extends ServiceImpl List describeClazzListByArgs(Q criteria) { + public List queryClazzListByArgs(Q criteria) { QueryWrapper predicate = CsMpSimpleQUtil.build(criteria); return baseMapper.selectList(predicate); } @@ -155,7 +155,7 @@ public class CsMpServiceImpl, T> extends ServiceImpl describeClazzListByArgs(LambdaQueryWrapper wrapper) { + public List queryClazzListByArgs(LambdaQueryWrapper wrapper) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } @@ -168,7 +168,7 @@ public class CsMpServiceImpl, T> extends ServiceImpl List describeFeatureClazzListByArgs(Q criteria, Class targetClazz) { + public List queryFeatureClazzListByArgs(Q criteria, Class targetClazz) { QueryWrapper predicate = CsMpSimpleQUtil.build(criteria); List data = baseMapper.selectList(predicate); return BeanUtil.copyToList(data, targetClazz); @@ -180,7 +180,7 @@ public class CsMpServiceImpl, T> extends ServiceImpl List describeFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz) { + public List queryFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } @@ -193,7 +193,7 @@ public class CsMpServiceImpl, T> extends ServiceImpl> describeClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable) { + public CsResultVo> queryClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } @@ -208,7 +208,7 @@ public class CsMpServiceImpl, T> extends ServiceImpl CsResultVo> describeFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz) { + public CsResultVo> queryFeatureClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable, Class targetClazz) { if (wrapper == null) { wrapper = new LambdaQueryWrapper<>(); } @@ -216,13 +216,13 @@ public class CsMpServiceImpl, T> extends ServiceImpl(BeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal()); } - public CsResultVo> describeFeatureClazzPageByArgs(Q criteria, IPage pageable, Class targetClazz) { + public CsResultVo> queryFeatureClazzPageByArgs(Q criteria, IPage pageable, Class targetClazz) { QueryWrapper wrapper = CsMpSimpleQUtil.build(criteria); IPage originPageData = baseMapper.selectPage(pageable, wrapper); return new CsResultVo<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz), originPageData.getTotal()); } - public CsResultVo> describeClazzPageByArgs(Q criteria, IPage pageable) { + public CsResultVo> queryClazzPageByArgs(Q criteria, IPage pageable) { QueryWrapper wrapper = CsMpSimpleQUtil.build(criteria); IPage originPageData = baseMapper.selectPage(pageable, wrapper); return new CsResultVo<>(originPageData.getRecords(), originPageData.getTotal()); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java index 90ecc1fb..1b6cb7e4 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java @@ -39,7 +39,7 @@ public class TokenFilter extends GenericFilterBean { if (StrUtil.isNotBlank(token)) { // 获取用户Token的Key String loginKey = tokenProvider.loginKey(token); - SystemUserOnlineVo userOnlineVo = systemUserOnlineApi.describeUserOnlineModelByKey(loginKey); + SystemUserOnlineVo userOnlineVo = systemUserOnlineApi.queryUserOnlineModelByKey(loginKey); // 判断用户在线信息是否为空 if (userOnlineVo != null) { // Token 续期判断 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java index ea6243f0..fd862267 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java @@ -28,9 +28,9 @@ public class UserDetailsHandler implements UserDetailsService { @Override public SystemUserJwtVo loadUserByUsername(String username) { - SystemUserJwtVo userJwtVo = systemUserJwtApi.describeUserJwtModelByUsername(username); + SystemUserJwtVo userJwtVo = systemUserJwtApi.queryUserJwtModelByUsername(username); if (userJwtVo == null) { - SystemUserTb user = systemUserService.describeUserByUsername(username); + SystemUserTb user = systemUserService.queryUserByUsername(username); if (user == null) { throw new BadRequestException("用户不存在"); } else { @@ -40,7 +40,7 @@ public class UserDetailsHandler implements UserDetailsService { // 获取用户的权限 List authorities = systemRoleService.buildUserRolePermissions(user); // 初始化JwtUserDto - userJwtVo = new SystemUserJwtVo(user, systemDataService.describeDeptIdListByUserIdWithDeptId(user), authorities); + userJwtVo = new SystemUserJwtVo(user, systemDataService.queryDeptIdListByUserIdWithDeptId(user), authorities); // 添加缓存数据 systemUserJwtService.saveUserJwtModelByUserName(username, userJwtVo); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataService.java index 5d19f2a9..4c4542c1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataService.java @@ -16,5 +16,5 @@ public interface SystemDataService { * @param user / * @return / */ - List describeDeptIdListByUserIdWithDeptId(SystemUserTb user); + List queryDeptIdListByUserIdWithDeptId(SystemUserTb user); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataServiceImpl.java index 786c2e74..00a5c937 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataServiceImpl.java @@ -30,11 +30,11 @@ public class SystemDataServiceImpl implements SystemDataService { * @return / */ @Override - public List describeDeptIdListByUserIdWithDeptId(SystemUserTb user) { + public List queryDeptIdListByUserIdWithDeptId(SystemUserTb user) { String key = SystemRedisKey.DATA_USER + user.getId(); Set deptIds = new HashSet<>(); // 查询用户角色 - List roleList = systemRoleService.describeRoleListByUsersId(user.getId()); + List roleList = systemRoleService.queryRoleListByUsersId(user.getId()); // 获取对应的部门ID for (SystemRoleTb role : roleList) { SystemDataScopeEnum dataScopeEnum = SystemDataScopeEnum.find(role.getDataScope()); @@ -60,12 +60,12 @@ public class SystemDataServiceImpl implements SystemDataService { * @return 数据权限ID */ public Set getCustomize(Set deptIds, SystemRoleTb role) { - Set deptList = systemDeptService.describeDeptByRoleId(role.getId()); + Set deptList = systemDeptService.queryDeptByRoleId(role.getId()); for (SystemDeptTb dept : deptList) { deptIds.add(dept.getId()); - List deptChildren = systemDeptService.describeDeptListByPid(dept.getId()); + List deptChildren = systemDeptService.queryDeptListByPid(dept.getId()); if (CollUtil.isNotEmpty(deptChildren)) { - deptIds.addAll(systemDeptService.describeChildDeptIdListByDeptIds(deptChildren)); + deptIds.addAll(systemDeptService.queryChildDeptIdListByDeptIds(deptChildren)); } } return deptIds; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptService.java index 6ab12965..ba4cec4c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptService.java @@ -50,7 +50,7 @@ public interface SystemDeptService extends IService { * @return / * @throws Exception / */ - List describeDeptList(QuerySystemDeptArgs criteria, Boolean isQuery) throws Exception; + List queryDeptList(QuerySystemDeptArgs criteria, Boolean isQuery) throws Exception; /** * 根据ID查询 @@ -58,7 +58,7 @@ public interface SystemDeptService extends IService { * @param id / * @return / */ - SystemDeptTb describeDeptById(Long id); + SystemDeptTb queryDeptById(Long id); /** * 根据PID查询 @@ -66,7 +66,7 @@ public interface SystemDeptService extends IService { * @param pid / * @return / */ - List describeDeptListByPid(long pid); + List queryDeptListByPid(long pid); /** * 根据角色ID查询 @@ -74,7 +74,7 @@ public interface SystemDeptService extends IService { * @param id / * @return / */ - Set describeDeptByRoleId(Long id); + Set queryDeptByRoleId(Long id); /** * 获取部门下所有关联的部门 @@ -83,7 +83,7 @@ public interface SystemDeptService extends IService { * @param depts / * @return / */ - Set describeRelationDeptSet(List deptList, Set depts); + Set queryRelationDeptSet(List deptList, Set depts); /** * 根据ID获取同级与上级数据 @@ -92,7 +92,7 @@ public interface SystemDeptService extends IService { * @param depts / * @return / */ - List describeSuperiorDeptListByPid(SystemDeptTb dept, List depts); + List querySuperiorDeptListByPid(SystemDeptTb dept, List depts); /** * 构建树形数据 @@ -108,7 +108,7 @@ public interface SystemDeptService extends IService { * @param deptList 、 * @return 、 */ - List describeChildDeptIdListByDeptIds(List deptList); + List queryChildDeptIdListByDeptIds(List deptList); /** * 验证是否被角色或用户关联 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptServiceImpl.java index 7a901c95..5115ae74 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptServiceImpl.java @@ -53,7 +53,7 @@ public class SystemDeptServiceImpl extends ServiceImpl describeDeptList(QuerySystemDeptArgs criteria, Boolean isQuery) throws Exception { + public List queryDeptList(QuerySystemDeptArgs criteria, Boolean isQuery) throws Exception { String dataScopeType = SecurityHelper.getDataScopeType(); if (isQuery) { if (dataScopeType.equals(SystemDataScopeEnum.ALL.getValue())) { @@ -148,40 +148,40 @@ public class SystemDeptServiceImpl extends ServiceImpl describeDeptListByPid(long pid) { + public List queryDeptListByPid(long pid) { return systemDeptMapper.queryDeptListByPid(pid); } @Override - public Set describeDeptByRoleId(Long id) { + public Set queryDeptByRoleId(Long id) { return systemDeptMapper.queryDeptSetByRoleId(id); } @Override - public Set describeRelationDeptSet(List menuList, Set deptSet) { + public Set queryRelationDeptSet(List menuList, Set deptSet) { for (SystemDeptTb dept : menuList) { deptSet.add(dept); List deptList = systemDeptMapper.queryDeptListByPid(dept.getId()); if (CollUtil.isNotEmpty(deptList)) { - describeRelationDeptSet(deptList, deptSet); + queryRelationDeptSet(deptList, deptSet); } } return deptSet; } @Override - public List describeChildDeptIdListByDeptIds(List deptList) { + public List queryChildDeptIdListByDeptIds(List deptList) { List list = new ArrayList<>(); for (SystemDeptTb systemDeptTb : deptList) { if (systemDeptTb != null && systemDeptTb.getEnabled()) { List deptList1 = systemDeptMapper.queryDeptListByPid(systemDeptTb.getId()); if (CollUtil.isNotEmpty(deptList1)) { - list.addAll(describeChildDeptIdListByDeptIds(deptList1)); + list.addAll(queryChildDeptIdListByDeptIds(deptList1)); } list.add(systemDeptTb.getId()); } @@ -190,13 +190,13 @@ public class SystemDeptServiceImpl extends ServiceImpl describeSuperiorDeptListByPid(SystemDeptTb dept, List deptList) { + public List querySuperiorDeptListByPid(SystemDeptTb dept, List deptList) { if (dept.getPid() == null) { deptList.addAll(systemDeptMapper.queryDeptListByPidIsNull()); return deptList; } deptList.addAll(systemDeptMapper.queryDeptListByPid(dept.getPid())); - return describeSuperiorDeptListByPid(describeDeptById(dept.getPid()), deptList); + return querySuperiorDeptListByPid(queryDeptById(dept.getPid()), deptList); } @Override @@ -221,7 +221,7 @@ public class SystemDeptServiceImpl extends ServiceImpl depts = new HashSet<>(); for (Long id : ids) { // 根部门 - depts.add(describeDeptById(id)); + depts.add(queryDeptById(id)); // 子部门 - List deptList = describeDeptListByPid(id); + List deptList = queryDeptListByPid(id); if (CollectionUtil.isNotEmpty(deptList)) { - depts = describeRelationDeptSet(deptList, depts); + depts = queryRelationDeptSet(deptList, depts); } } return depts; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailService.java index 776b62cc..8c3b1550 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailService.java @@ -46,5 +46,5 @@ public interface SystemDictDetailService extends IService { * @param name 字典名称 * @return / */ - List describeDictDetailListByName(String name); + List queryDictDetailListByName(String name); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailServiceImpl.java index 6174637b..4442b0e3 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailServiceImpl.java @@ -50,7 +50,7 @@ public class SystemDictDetailServiceImpl extends ServiceImpl describeDictDetailListByName(String name) { + public List queryDictDetailListByName(String name) { return systemDictDetailMapper.queryDictDetailListByDictName(name); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictService.java index 4f2a566f..5ce47137 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictService.java @@ -51,7 +51,7 @@ public interface SystemDictService extends IService { * @param page 分页参数 * @return / */ - CsResultVo> describeDictPage(QuerySystemDictArgs criteria, Page page); + CsResultVo> queryDictPage(QuerySystemDictArgs criteria, Page page); /** * 查询全部数据 @@ -59,5 +59,5 @@ public interface SystemDictService extends IService { * @param criteria / * @return / */ - List describeDictList(QuerySystemDictArgs criteria); + List queryDictList(QuerySystemDictArgs criteria); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictServiceImpl.java index e3009a10..33d28a32 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictServiceImpl.java @@ -84,13 +84,13 @@ public class SystemDictServiceImpl extends ServiceImpl> describeDictPage(QuerySystemDictArgs criteria, Page page) { + public CsResultVo> queryDictPage(QuerySystemDictArgs criteria, Page page) { IPage dicts = systemDictMapper.queryDictPageByArgs(criteria, page); return PageUtil.toPage(dicts); } @Override - public List describeDictList(QuerySystemDictArgs criteria) { + public List queryDictList(QuerySystemDictArgs criteria) { return systemDictMapper.queryDictPageByArgs(criteria, PageUtil.getCount(systemDictMapper)).getRecords(); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailService.java index 8ab77e87..e89c5c42 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailService.java @@ -29,5 +29,5 @@ public interface SystemEmailService extends IService { * * @return EmailConfig 邮件配置 */ - SystemEmailConfigTb describeEmailConfig(); + SystemEmailConfigTb queryEmailConfig(); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailServiceImpl.java index 97073290..5942511a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailServiceImpl.java @@ -22,7 +22,7 @@ public class SystemEmailServiceImpl extends ServiceImpl { * @param page 分页参数 * @return / */ - CsResultVo> describeJobPage(QuerySystemJobArgs criteria, Page page); + CsResultVo> queryJobPage(QuerySystemJobArgs criteria, Page page); /** * 查询全部数据 @@ -58,7 +58,7 @@ public interface SystemJobService extends IService { * @param criteria / * @return / */ - List describeJobList(QuerySystemJobArgs criteria); + List queryJobList(QuerySystemJobArgs criteria); /** @@ -74,5 +74,5 @@ public interface SystemJobService extends IService { * @param id / * @return / */ - SystemJobTb describeJobById(Long id); + SystemJobTb queryJobById(Long id); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemJobServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemJobServiceImpl.java index 995f7564..aef18cf3 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemJobServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemJobServiceImpl.java @@ -73,17 +73,17 @@ public class SystemJobServiceImpl extends ServiceImpl> describeJobPage(QuerySystemJobArgs criteria, Page page) { + public CsResultVo> queryJobPage(QuerySystemJobArgs criteria, Page page) { return PageUtil.toPage(systemJobMapper.queryJobPageByArgs(criteria, page)); } @Override - public List describeJobList(QuerySystemJobArgs criteria) { + public List queryJobList(QuerySystemJobArgs criteria) { return systemJobMapper.queryJobPageByArgs(criteria, PageUtil.getCount(systemJobMapper)).getRecords(); } @Override - public SystemJobTb describeJobById(Long id) { + public SystemJobTb queryJobById(Long id) { return systemJobMapper.selectById(id); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageService.java index 6169e779..a3629dff 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageService.java @@ -52,7 +52,7 @@ public interface SystemLocalStorageService extends IService> describeLocalStoragePage(QuerySystemLocalStorageArgs criteria, Page page); + CsResultVo> queryLocalStoragePage(QuerySystemLocalStorageArgs criteria, Page page); /** * 查询全部数据 @@ -60,5 +60,5 @@ public interface SystemLocalStorageService extends IService describeLocalStorageList(QuerySystemLocalStorageArgs criteria); + List queryLocalStorageList(QuerySystemLocalStorageArgs criteria); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageServiceImpl.java index 400da291..ee729716 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageServiceImpl.java @@ -97,12 +97,12 @@ public class SystemLocalStorageServiceImpl extends ServiceImpl> describeLocalStoragePage(QuerySystemLocalStorageArgs criteria, Page page) { + public CsResultVo> queryLocalStoragePage(QuerySystemLocalStorageArgs criteria, Page page) { return PageUtil.toPage(systemLocalStorageMapper.queryLocalStoragePageByArgs(criteria, page)); } @Override - public List describeLocalStorageList(QuerySystemLocalStorageArgs criteria) { + public List queryLocalStorageList(QuerySystemLocalStorageArgs criteria) { return systemLocalStorageMapper.queryLocalStoragePageByArgs(criteria, PageUtil.getCount(systemLocalStorageMapper)).getRecords(); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuService.java index 87e0b502..0fcce901 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuService.java @@ -53,7 +53,7 @@ public interface SystemMenuService extends IService { * @return / * @throws Exception / */ - List describeMenuList(QuerySystemMenuArgs criteria, Boolean isQuery) throws Exception; + List queryMenuList(QuerySystemMenuArgs criteria, Boolean isQuery) throws Exception; /** * 根据ID查询 @@ -61,7 +61,7 @@ public interface SystemMenuService extends IService { * @param id / * @return / */ - SystemMenuTb describeMenuById(long id); + SystemMenuTb queryMenuById(long id); /** * 获取所有子节点，包含自身ID @@ -70,7 +70,7 @@ public interface SystemMenuService extends IService { * @param menuSet / * @return / */ - Set describeChildMenuSet(List menuList, Set menuSet); + Set queryChildMenuSet(List menuList, Set menuSet); /** * 构建菜单树 @@ -94,7 +94,7 @@ public interface SystemMenuService extends IService { * @param pid / * @return / */ - List describeMenuListByPid(Long pid); + List queryMenuListByPid(Long pid); /** * 根据ID获取同级与上级数据 @@ -103,7 +103,7 @@ public interface SystemMenuService extends IService { * @param objects / * @return / */ - List describeSuperiorMenuList(SystemMenuTb menu, List objects); + List querySuperiorMenuList(SystemMenuTb menu, List objects); /** * 根据当前用户获取菜单 @@ -111,5 +111,5 @@ public interface SystemMenuService extends IService { * @param currentUserId / * @return / */ - List describeMenuListByUserId(Long currentUserId); + List queryMenuListByUserId(Long currentUserId); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuServiceImpl.java index 28e245ec..f9d951e8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuServiceImpl.java @@ -159,7 +159,7 @@ public class SystemMenuServiceImpl extends ServiceImpl describeMenuList(QuerySystemMenuArgs criteria, Boolean isQuery) throws Exception { + public List queryMenuList(QuerySystemMenuArgs criteria, Boolean isQuery) throws Exception { if (Boolean.TRUE.equals(isQuery)) { criteria.setPidIsNull(true); List fields = ClassUtil.getAllFields(criteria.getClass(), new ArrayList<>()); @@ -181,7 +181,7 @@ public class SystemMenuServiceImpl extends ServiceImpl describeMenuListByUserId(Long currentUserId) { - List roles = systemRoleService.describeRoleListByUsersId(currentUserId); + public List queryMenuListByUserId(Long currentUserId) { + List roles = systemRoleService.queryRoleListByUsersId(currentUserId); Set roleIds = roles.stream().map(SystemRoleTb::getId).collect(Collectors.toSet()); return new ArrayList<>(systemMenuMapper.queryMenuSetByRoleIdsAndType(roleIds, 2)); } @Override - public Set describeChildMenuSet(List menuList, Set menuSet) { + public Set queryChildMenuSet(List menuList, Set menuSet) { for (SystemMenuTb menu : menuList) { menuSet.add(menu); List menus = systemMenuMapper.queryMenuListByPidOrderByMenuSort(menu.getId()); if (CollUtil.isNotEmpty(menus)) { - describeChildMenuSet(menus, menuSet); + queryChildMenuSet(menus, menuSet); } } return menuSet; } @Override - public List describeMenuListByPid(Long pid) { + public List queryMenuListByPid(Long pid) { List menus; if (pid != null && !pid.equals(0L)) { menus = systemMenuMapper.queryMenuListByPidOrderByMenuSort(pid); @@ -222,13 +222,13 @@ public class SystemMenuServiceImpl extends ServiceImpl describeSuperiorMenuList(SystemMenuTb menu, List menus) { + public List querySuperiorMenuList(SystemMenuTb menu, List menus) { if (menu.getPid() == null) { menus.addAll(systemMenuMapper.queryMenuListByPidIsNullOrderByMenuSort()); return menus; } menus.addAll(systemMenuMapper.queryMenuListByPidOrderByMenuSort(menu.getPid())); - return describeSuperiorMenuList(describeMenuById(menu.getPid()), menus); + return querySuperiorMenuList(queryMenuById(menu.getPid()), menus); } @Override diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorService.java index d703dece..0eead8cd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorService.java @@ -9,5 +9,5 @@ public interface SystemMonitorService { * * @return Map */ - Map describeServerMonitorInfo(); + Map queryServerMonitorInfo(); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorServiceImpl.java index 2014db72..1006ad3f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorServiceImpl.java @@ -28,7 +28,7 @@ public class SystemMonitorServiceImpl implements SystemMonitorService { private final DecimalFormat df = new DecimalFormat("0.00"); @Override - public Map describeServerMonitorInfo() { + public Map queryServerMonitorInfo() { Map resultMap = new LinkedHashMap<>(8); try { SystemInfo si = new SystemInfo(); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigService.java index aba57359..8bd4c147 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigService.java @@ -25,5 +25,5 @@ public interface SystemQiniuConfigService extends IService * * @return QiniuConfig */ - SystemQiniuConfigTb describeQiniuConfig(); + SystemQiniuConfigTb queryQiniuConfig(); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigServiceImpl.java index 6f655cd2..b7e71782 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigServiceImpl.java @@ -39,7 +39,7 @@ public class SystemQiniuConfigServiceImpl extends ServiceImpl> describeQiniuContentPage(QuerySystemQiniuArgs criteria, Page page); + CsResultVo> queryQiniuContentPage(QuerySystemQiniuArgs criteria, Page page); /** * 查询全部 @@ -71,5 +71,5 @@ public interface SystemQiniuContentService extends IService describeQiniuContentList(QuerySystemQiniuArgs criteria); + List queryQiniuContentList(QuerySystemQiniuArgs criteria); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuContentServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuContentServiceImpl.java index 1ad472ec..21149d76 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuContentServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuContentServiceImpl.java @@ -46,7 +46,7 @@ public class SystemQiniuContentServiceImpl extends ServiceImpl> describeQiniuContentPage(QuerySystemQiniuArgs criteria, Page page) { + public CsResultVo> queryQiniuContentPage(QuerySystemQiniuArgs criteria, Page page) { return PageUtil.toPage(systemQiniuContentMapper.queryQiniuContentPageByArgs(criteria, page)); } @Override - public List describeQiniuContentList(QuerySystemQiniuArgs criteria) { + public List queryQiniuContentList(QuerySystemQiniuArgs criteria) { return systemQiniuContentMapper.queryQiniuContentPageByArgs(criteria, PageUtil.getCount(systemQiniuContentMapper)).getRecords(); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobService.java index b47aefc0..86e3a8ff 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobService.java @@ -83,7 +83,7 @@ public interface SystemQuartzJobService extends IService { * @param page 分页参数 * @return / */ - CsResultVo> describeQuartzJobPage(QuerySystemQuartzJobArgs criteria, Page page); + CsResultVo> queryQuartzJobPage(QuerySystemQuartzJobArgs criteria, Page page); /** * 查询全部 @@ -91,7 +91,7 @@ public interface SystemQuartzJobService extends IService { * @param criteria 条件 * @return / */ - List describeQuartzJobList(QuerySystemQuartzJobArgs criteria); + List queryQuartzJobList(QuerySystemQuartzJobArgs criteria); /** * 分页查询日志 @@ -100,7 +100,7 @@ public interface SystemQuartzJobService extends IService { * @param page 分页参数 * @return / */ - CsResultVo> describeQuartzLogPage(QuerySystemQuartzJobArgs criteria, Page page); + CsResultVo> queryQuartzLogPage(QuerySystemQuartzJobArgs criteria, Page page); /** * 查询全部 @@ -108,5 +108,5 @@ public interface SystemQuartzJobService extends IService { * @param criteria 条件 * @return / */ - List describeQuartzLogList(QuerySystemQuartzJobArgs criteria); + List queryQuartzLogList(QuerySystemQuartzJobArgs criteria); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobServiceImpl.java index 971a95d8..31f9049c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobServiceImpl.java @@ -162,22 +162,22 @@ public class SystemQuartzJobServiceImpl extends ServiceImpl> describeQuartzJobPage(QuerySystemQuartzJobArgs criteria, Page page) { + public CsResultVo> queryQuartzJobPage(QuerySystemQuartzJobArgs criteria, Page page) { return PageUtil.toPage(systemQuartzJobMapper.queryQuartzJobPageByArgs(criteria, page)); } @Override - public CsResultVo> describeQuartzLogPage(QuerySystemQuartzJobArgs criteria, Page page) { + public CsResultVo> queryQuartzLogPage(QuerySystemQuartzJobArgs criteria, Page page) { return PageUtil.toPage(systemQuartzLogMapper.queryQuartzLogPageByArgs(criteria, page)); } @Override - public List describeQuartzJobList(QuerySystemQuartzJobArgs criteria) { + public List queryQuartzJobList(QuerySystemQuartzJobArgs criteria) { return systemQuartzJobMapper.queryQuartzJobPageByArgs(criteria, PageUtil.getCount(systemQuartzJobMapper)).getRecords(); } @Override - public List describeQuartzLogList(QuerySystemQuartzJobArgs criteria) { + public List queryQuartzLogList(QuerySystemQuartzJobArgs criteria) { return systemQuartzLogMapper.queryQuartzLogPageByArgs(criteria, PageUtil.getCount(systemQuartzLogMapper)).getRecords(); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleService.java index 4b3a6ccb..66e74e70 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleService.java @@ -60,7 +60,7 @@ public interface SystemRoleService extends IService { * * @return / */ - List describeRoleList(); + List queryRoleList(); /** * 查询全部 @@ -68,7 +68,7 @@ public interface SystemRoleService extends IService { * @param criteria 条件 * @return / */ - List describeRoleList(QuerySystemRoleArgs criteria); + List queryRoleList(QuerySystemRoleArgs criteria); /** * 待条件分页查询 @@ -77,7 +77,7 @@ public interface SystemRoleService extends IService { * @param page 分页参数 * @return / */ - CsResultVo> describeRolePage(QuerySystemRoleArgs criteria, Page page); + CsResultVo> queryRolePage(QuerySystemRoleArgs criteria, Page page); /** * 根据ID查询 @@ -85,7 +85,7 @@ public interface SystemRoleService extends IService { * @param id / * @return / */ - SystemRoleTb describeRoleById(long id); + SystemRoleTb queryRoleById(long id); /** @@ -94,7 +94,7 @@ public interface SystemRoleService extends IService { * @param userId 用户ID * @return / */ - List describeRoleListByUsersId(Long userId); + List queryRoleListByUsersId(Long userId); /** * 根据角色查询角色级别 @@ -102,7 +102,7 @@ public interface SystemRoleService extends IService { * @param roles / * @return / */ - Integer describeDeptLevelByRoles(Set roles); + Integer queryDeptLevelByRoles(Set roles); /** * 获取用户权限信息 @@ -125,5 +125,5 @@ public interface SystemRoleService extends IService { * @param menuId / * @return / */ - List describeRoleListByMenuId(Long menuId); + List queryRoleListByMenuId(Long menuId); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleServiceImpl.java index e956c5dd..442c749f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleServiceImpl.java @@ -116,17 +116,17 @@ public class SystemRoleServiceImpl extends ServiceImpl describeRoleList() { + public List queryRoleList() { return systemRoleMapper.queryRoleList(); } @Override - public List describeRoleList(QuerySystemRoleArgs criteria) { + public List queryRoleList(QuerySystemRoleArgs criteria) { return systemRoleMapper.queryRoleListByArgs(criteria); } @Override - public CsResultVo> describeRolePage(QuerySystemRoleArgs criteria, Page page) { + public CsResultVo> queryRolePage(QuerySystemRoleArgs criteria, Page page) { criteria.setOffset(page.offset()); List roles = systemRoleMapper.queryRoleListByArgs(criteria); Long total = systemRoleMapper.getRoleCountByArgs(criteria); @@ -134,23 +134,23 @@ public class SystemRoleServiceImpl extends ServiceImpl describeRoleListByUsersId(Long userId) { + public List queryRoleListByUsersId(Long userId) { return systemRoleMapper.queryRoleListByUserId(userId); } @Override - public Integer describeDeptLevelByRoles(Set roles) { + public Integer queryDeptLevelByRoles(Set roles) { if (CollUtil.isEmpty(roles)) { return Integer.MAX_VALUE; } Set roleSet = new HashSet<>(); for (SystemRoleTb role : roles) { - roleSet.add(describeRoleById(role.getId())); + roleSet.add(queryRoleById(role.getId())); } return Collections.min(roleSet.stream().map(SystemRoleTb::getLevel).collect(Collectors.toList())); } @@ -180,7 +180,7 @@ public class SystemRoleServiceImpl extends ServiceImpl describeRoleListByMenuId(Long menuId) { + public List queryRoleListByMenuId(Long menuId) { return systemRoleMapper.queryRoleListByMenuId(menuId); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java index 8f4c6c0f..39966399 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java @@ -91,7 +91,7 @@ public interface SystemUserService extends IService { * @param id ID * @return / */ - SystemUserTb describeUserById(long id); + SystemUserTb queryUserById(long id); /** * 根据用户名查询 @@ -99,7 +99,7 @@ public interface SystemUserService extends IService { * @param username / * @return / */ - SystemUserTb describeUserByUsername(String username); + SystemUserTb queryUserByUsername(String username); /** * 查询全部 @@ -108,7 +108,7 @@ public interface SystemUserService extends IService { * @param page 分页参数 * @return / */ - CsResultVo> describeUserPage(QuerySystemUserArgs criteria, Page page); + CsResultVo> queryUserPage(QuerySystemUserArgs criteria, Page page); /** * 查询全部不分页 @@ -116,5 +116,5 @@ public interface SystemUserService extends IService { * @param criteria 条件 * @return / */ - List describeUserList(QuerySystemUserArgs criteria); + List queryUserList(QuerySystemUserArgs criteria); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserServiceImpl.java index bb275f88..1e71aba4 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserServiceImpl.java @@ -225,7 +225,7 @@ public class SystemUserServiceImpl extends ServiceImpl> describeUserPage(QuerySystemUserArgs criteria, Page page) { + public CsResultVo> queryUserPage(QuerySystemUserArgs criteria, Page page) { criteria.setOffset(page.offset()); List users = systemUserMapper.queryUserPageByArgs(criteria, PageUtil.getCount(systemUserMapper)).getRecords(); Long total = systemUserMapper.getUserCountByArgs(criteria); @@ -233,17 +233,17 @@ public class SystemUserServiceImpl extends ServiceImpl describeUserList(QuerySystemUserArgs criteria) { + public List queryUserList(QuerySystemUserArgs criteria) { return systemUserMapper.queryUserPageByArgs(criteria, PageUtil.getCount(systemUserMapper)).getRecords(); } @Override - public SystemUserTb describeUserById(long id) { + public SystemUserTb queryUserById(long id) { return systemUserMapper.selectById(id); } @Override - public SystemUserTb describeUserByUsername(String username) { + public SystemUserTb queryUserByUsername(String username) { return systemUserMapper.getUserByUsername(username); } }