From 48e6e9298a901211ba1ddf1df4711d87bcb22aff Mon Sep 17 00:00:00 2001 From: Odboy Date: Tue, 30 Dec 2025 21:34:02 +0800 Subject: [PATCH] =?UTF-8?q?refactor(api):=20=E9=87=8D=E6=9E=84API=E7=AB=AF?= =?UTF-8?q?=E7=82=B9=E5=92=8C=E5=89=8D=E7=AB=AFCRUD=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cutejava-front/src/api/system/dept.js | 2 +- cutejava-front/src/api/system/dictDetail.js | 2 +- cutejava-front/src/api/system/job.js | 2 +- cutejava-front/src/api/system/menu.js | 2 +- cutejava-front/src/api/system/quartzJob.js | 4 ++-- cutejava-front/src/components/Crud/crud.js | 6 ++++-- cutejava-front/src/views/system/dept/index.vue | 2 +- cutejava-front/src/views/system/dict/dictDetail.vue | 2 +- cutejava-front/src/views/system/dict/index.vue | 2 +- cutejava-front/src/views/system/job/index.vue | 1 + cutejava-front/src/views/system/menu/index.vue | 2 +- cutejava-front/src/views/system/online/index.vue | 2 +- cutejava-front/src/views/system/quartzJob/index.vue | 2 +- cutejava-front/src/views/system/quartzJob/log.vue | 2 +- cutejava-front/src/views/system/role/index.vue | 2 +- .../src/views/system/storage/local/index.vue | 2 +- .../src/views/system/storage/oss/index.vue | 2 +- cutejava-front/src/views/system/user/index.vue | 2 +- .../system/controller/SystemAuthController.java | 7 ------- .../system/controller/SystemDeptController.java | 2 +- .../system/controller/SystemDictController.java | 9 +++------ .../controller/SystemDictDetailController.java | 9 +-------- .../odboy/system/controller/SystemJobController.java | 12 ++---------- .../controller/SystemLocalStorageController.java | 2 +- .../system/controller/SystemMenuController.java | 10 +--------- .../system/controller/SystemOnlineController.java | 4 ++-- .../controller/SystemOssStorageController.java | 2 +- .../system/controller/SystemQuartzJobController.java | 6 +++--- .../system/controller/SystemRoleController.java | 8 ++++---- .../system/controller/SystemUserController.java | 2 +- .../system/dal/redis/SystemUserOnlineInfoDAO.java | 2 +- .../cn/odboy/system/service/SystemRoleService.java | 2 +- 32 files changed, 44 insertions(+), 74 deletions(-) diff --git a/cutejava-front/src/api/system/dept.js b/cutejava-front/src/api/system/dept.js index 9cf64327..b9752721 100644 --- a/cutejava-front/src/api/system/dept.js +++ b/cutejava-front/src/api/system/dept.js @@ -29,7 +29,7 @@ export function edit(data) { export function queryDeptList(params) { return request({ - url: 'api/dept', + url: 'api/dept/queryAllDeptByArgs', method: 'post', data: params }) diff --git a/cutejava-front/src/api/system/dictDetail.js b/cutejava-front/src/api/system/dictDetail.js index 11cb1c31..3cb21158 100644 --- a/cutejava-front/src/api/system/dictDetail.js +++ b/cutejava-front/src/api/system/dictDetail.js @@ -11,7 +11,7 @@ export function get(dictName) { } } return request({ - url: 'api/dictDetail/queryDictDetailByArgs', + url: 'api/dictDetail/searchDictDetail', method: 'post', data: params }) diff --git a/cutejava-front/src/api/system/job.js b/cutejava-front/src/api/system/job.js index 557d9b3c..befb6a42 100644 --- a/cutejava-front/src/api/system/job.js +++ b/cutejava-front/src/api/system/job.js @@ -34,7 +34,7 @@ export function queryAllEnableJob() { } } return request({ - url: 'api/job/queryAllEnableJob', + url: 'api/job/searchJob', method: 'post', data: params }) diff --git a/cutejava-front/src/api/system/menu.js b/cutejava-front/src/api/system/menu.js index 70b7655e..f76421c0 100644 --- a/cutejava-front/src/api/system/menu.js +++ b/cutejava-front/src/api/system/menu.js @@ -36,7 +36,7 @@ export function queryMenuListByPid(pid) { export function queryMenuByArgs(params) { return request({ - url: 'api/menu/queryMenuByArgs', + url: 'api/menu/queryAllMenu', method: 'post', data: params }) diff --git a/cutejava-front/src/api/system/quartzJob.js b/cutejava-front/src/api/system/quartzJob.js index 1c03720b..4b15259d 100644 --- a/cutejava-front/src/api/system/quartzJob.js +++ b/cutejava-front/src/api/system/quartzJob.js @@ -20,8 +20,8 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/quartzJob', - method: 'put', + url: 'api/quartzJob/updateQuartzJobResumeCron', + method: 'post', data: data }) } diff --git a/cutejava-front/src/components/Crud/crud.js b/cutejava-front/src/components/Crud/crud.js index 5350fd85..1c482dc6 100644 --- a/cutejava-front/src/components/Crud/crud.js +++ b/cutejava-front/src/components/Crud/crud.js @@ -17,8 +17,10 @@ function CRUD(options) { idField: 'id', // 标题 title: '', - // 请求数据的url + // 请求数据的url, @Controller注解的路径 url: '', + // 分页查询路由，@PostMapping注解的路径 + searchRouter: '', // 表格数据 data: [], // 选择项 @@ -134,7 +136,7 @@ function CRUD(options) { return new Promise((resolve, reject) => { crud.loading = true // 请求数据 - initData(crud.url, crud.getQueryParams()).then(data => { + initData(crud.url + crud.searchRouter, crud.getQueryParams()).then(data => { const table = crud.getTable() if (table && table.lazy) { // 懒加载子节点数据，清掉已加载的数据 table.store.states.treeData = {} diff --git a/cutejava-front/src/views/system/dept/index.vue b/cutejava-front/src/views/system/dept/index.vue index 5a29edb5..3ad7e9ee 100644 --- a/cutejava-front/src/views/system/dept/index.vue +++ b/cutejava-front/src/views/system/dept/index.vue @@ -140,7 +140,7 @@ export default { name: 'Dept', components: { Treeselect, crudOperation, rrOperation, udOperation, DateRangePicker }, cruds() { - return CRUD({ title: '部门', url: 'api/dept', crudMethod: { ...crudDept }}) + return CRUD({ title: '部门', url: 'api/dept', searchRouter: '/queryAllDeptByArgs', crudMethod: { ...crudDept }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], // 设置数据字典 diff --git a/cutejava-front/src/views/system/dict/dictDetail.vue b/cutejava-front/src/views/system/dict/dictDetail.vue index c9681a12..1085cf28 100644 --- a/cutejava-front/src/views/system/dict/dictDetail.vue +++ b/cutejava-front/src/views/system/dict/dictDetail.vue @@ -84,7 +84,7 @@ export default { cruds() { return [ CRUD({ - title: '字典详情', url: 'api/dictDetail', query: { dictName: '' }, + title: '字典详情', url: 'api/dictDetail', searchRouter: '/searchDictDetail', query: { dictName: '' }, crudMethod: { ...crudDictDetail }, optShow: { add: true, diff --git a/cutejava-front/src/views/system/dict/index.vue b/cutejava-front/src/views/system/dict/index.vue index a1f5a129..7750f37b 100644 --- a/cutejava-front/src/views/system/dict/index.vue +++ b/cutejava-front/src/views/system/dict/index.vue @@ -114,7 +114,7 @@ export default { components: { crudOperation, pagination, rrOperation, udOperation, dictDetail }, cruds() { return [ - CRUD({ title: '字典', url: 'api/dict', crudMethod: { ...crudDict }}) + CRUD({ title: '字典', url: 'api/dict', searchRouter: '/searchDict', crudMethod: { ...crudDict }}) ] }, mixins: [presenter(), header(), form(defaultForm)], diff --git a/cutejava-front/src/views/system/job/index.vue b/cutejava-front/src/views/system/job/index.vue index 74fcc7ba..55be1980 100644 --- a/cutejava-front/src/views/system/job/index.vue +++ b/cutejava-front/src/views/system/job/index.vue @@ -70,6 +70,7 @@ export default { return CRUD({ title: '岗位', url: 'api/job', + searchRouter: '/searchJob', crudMethod: { ...crudJob } }) }, diff --git a/cutejava-front/src/views/system/menu/index.vue b/cutejava-front/src/views/system/menu/index.vue index 75900be1..30e14192 100644 --- a/cutejava-front/src/views/system/menu/index.vue +++ b/cutejava-front/src/views/system/menu/index.vue @@ -239,7 +239,7 @@ export default { name: 'Menu', components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker }, cruds() { - return CRUD({ title: '菜单', url: 'api/menu', crudMethod: { ...crudMenu }}) + return CRUD({ title: '菜单', url: 'api/menu', searchRouter: '/queryAllMenu', crudMethod: { ...crudMenu }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/online/index.vue b/cutejava-front/src/views/system/online/index.vue index 16146dce..05db9e31 100644 --- a/cutejava-front/src/views/system/online/index.vue +++ b/cutejava-front/src/views/system/online/index.vue @@ -85,7 +85,7 @@ export default { name: 'OnlineUser', components: { pagination, crudOperation, rrOperation }, cruds() { - return CRUD({ url: 'api/user/online', title: '在线用户' }) + return CRUD({ url: 'api/user/online', searchRouter: '/searchOnlineUser', title: '在线用户' }) }, mixins: [presenter(), header(), crud()], data() { diff --git a/cutejava-front/src/views/system/quartzJob/index.vue b/cutejava-front/src/views/system/quartzJob/index.vue index 4726e6e8..5881f689 100644 --- a/cutejava-front/src/views/system/quartzJob/index.vue +++ b/cutejava-front/src/views/system/quartzJob/index.vue @@ -192,7 +192,7 @@ export default { name: 'QuartzJob', components: { Log, pagination, crudOperation, rrOperation, DateRangePicker }, cruds() { - return CRUD({ title: '定时任务', url: 'api/quartzJob', crudMethod: { ...crudJob }}) + return CRUD({ title: '定时任务', url: 'api/quartzJob', searchRouter: '/searchQuartzJob', crudMethod: { ...crudJob }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/quartzJob/log.vue b/cutejava-front/src/views/system/quartzJob/log.vue index 7a93d57a..e4f9c6c2 100644 --- a/cutejava-front/src/views/system/quartzJob/log.vue +++ b/cutejava-front/src/views/system/quartzJob/log.vue @@ -109,7 +109,7 @@ export default { }, // 获取数据前设置好接口地址 beforeInit() { - this.url = 'api/quartzJob/logs' + this.url = 'api/quartzJob/searchQuartzLog' this.size = 6 return true }, diff --git a/cutejava-front/src/views/system/role/index.vue b/cutejava-front/src/views/system/role/index.vue index 13fc7c0b..55de5eae 100644 --- a/cutejava-front/src/views/system/role/index.vue +++ b/cutejava-front/src/views/system/role/index.vue @@ -168,7 +168,7 @@ export default { name: 'Role', components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker }, cruds() { - return CRUD({ title: '角色', url: 'api/role', crudMethod: { ...crudRoles }}) + return CRUD({ title: '角色', url: 'api/role', searchRouter: '/searchRole', crudMethod: { ...crudRoles }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/storage/local/index.vue b/cutejava-front/src/views/system/storage/local/index.vue index 71313729..720b87d4 100644 --- a/cutejava-front/src/views/system/storage/local/index.vue +++ b/cutejava-front/src/views/system/storage/local/index.vue @@ -136,7 +136,7 @@ const defaultForm = { id: null, name: '' } export default { components: { pagination, crudOperation, rrOperation, DateRangePicker }, cruds() { - return CRUD({ title: '文件', url: 'api/localStorage', crudMethod: { ...crudFile }}) + return CRUD({ title: '文件', url: 'api/localStorage', searchRouter: '/searchLocalStorage', crudMethod: { ...crudFile }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/storage/oss/index.vue b/cutejava-front/src/views/system/storage/oss/index.vue index 47a23524..f23aec87 100644 --- a/cutejava-front/src/views/system/storage/oss/index.vue +++ b/cutejava-front/src/views/system/storage/oss/index.vue @@ -107,7 +107,7 @@ const defaultForm = { id: null } export default { components: { pagination, crudOperation, rrOperation, DateRangePicker }, cruds() { - return CRUD({ title: '文件', url: 'api/ossStorage', crudMethod: { ...crudFile }}) + return CRUD({ title: '文件', url: 'api/ossStorage', searchRouter: '/searchOssStorage', crudMethod: { ...crudFile }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/user/index.vue b/cutejava-front/src/views/system/user/index.vue index 272bbd4a..615ba25e 100644 --- a/cutejava-front/src/views/system/user/index.vue +++ b/cutejava-front/src/views/system/user/index.vue @@ -228,7 +228,7 @@ export default { name: 'User', components: { CuteDeptTree, Treeselect, crudOperation, rrOperation, udOperation, pagination, DateRangePicker }, cruds() { - return CRUD({ title: '用户', url: 'api/user', crudMethod: { ...crudUser }}) + return CRUD({ title: '用户', url: 'api/user', searchRouter: '/aggregationSearchUserByArgs', crudMethod: { ...crudUser }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], // 数据字典 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index afb31f2a..bdd29478 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -59,13 +59,6 @@ public class SystemAuthController { return ResponseEntity.ok(userInfoVo); } - @ApiOperation("获取验证码") - @AnonymousPostMapping(value = "/captcha/getImage") - public ResponseEntity> getCode() { - Map imgResult = systemAuthService.getCaptchaInfo(); - return ResponseEntity.ok(imgResult); - } - @ApiOperation("退出登录") @AnonymousPostMapping(value = "/logout") public ResponseEntity logout(HttpServletRequest request) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java index 580252f7..e233d481 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java @@ -54,7 +54,7 @@ public class SystemDeptController { } @ApiOperation("查询部门") - @PostMapping + @PostMapping(value = "/queryAllDeptByArgs") @PreAuthorize("@el.check('user:list','dept:list')") public ResponseEntity> queryDept( @Validated @RequestBody KitPageArgs pageArgs) throws Exception { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index 9d184b96..2c4ff3e8 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -20,7 +20,6 @@ import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictTb; import cn.odboy.system.dal.model.SystemCreateDictArgs; import cn.odboy.system.dal.model.SystemQueryDictArgs; -import cn.odboy.system.service.SystemDictDetailService; import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -46,8 +45,6 @@ public class SystemDictController { @Autowired private SystemDictService systemDictService; - @Autowired - private SystemDictDetailService systemDictDetailService; @ApiOperation("导出字典数据") @GetMapping(value = "/download") @@ -56,15 +53,15 @@ public class SystemDictController { systemDictService.exportDictXlsx(response, args); } - @ApiOperation("查询字典") + @ApiOperation("查询所有字典") @PostMapping(value = "/queryAllDict") @PreAuthorize("@el.check('dict:list')") public ResponseEntity> queryAllDict() { return ResponseEntity.ok(systemDictService.queryDictByArgs(new SystemQueryDictArgs())); } - @ApiOperation("查询字典") - @PostMapping + @ApiOperation("分页查询字典") + @PostMapping(value = "/searchDict") @PreAuthorize("@el.check('dict:list')") public ResponseEntity> queryDictByArgs( @Validated @RequestBody KitPageArgs pageArgs) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index eea619d6..678e61dd 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -47,14 +47,7 @@ public class SystemDictDetailController { private SystemDictDetailService systemDictDetailService; @ApiOperation("查询字典详情") - @PostMapping - public ResponseEntity> queryDictDetailByCrud( - @Validated @RequestBody KitPageArgs args) { - return queryDictDetailByArgs(args); - } - - @ApiOperation("查询字典详情") - @PostMapping(value = "/queryDictDetailByArgs") + @PostMapping(value = "/searchDictDetail") public ResponseEntity> queryDictDetailByArgs( @Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java index 8995aae7..263fb15b 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java @@ -52,8 +52,8 @@ public class SystemJobController { systemJobService.exportJobXlsx(response, args); } - @ApiOperation("查询岗位") - @PostMapping(value = "/queryAllEnableJob") + @ApiOperation("分页查询岗位") + @PostMapping(value = "/searchJob") @PreAuthorize("@el.check('job:list','user:list')") public ResponseEntity> queryJobByArgs( @Validated @RequestBody KitPageArgs pageArgs) { @@ -61,14 +61,6 @@ public class SystemJobController { return ResponseEntity.ok(systemJobService.searchJobByArgs(pageArgs.getArgs(), page)); } - @ApiOperation("查询岗位") - @PostMapping - @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity> queryJobByCrud( - @Validated @RequestBody KitPageArgs args) { - return queryJobByArgs(args); - } - @ApiOperation("新增岗位") @PostMapping(value = "/saveJob") @PreAuthorize("@el.check('job:add')") 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 172a5d6e..72112558 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 @@ -46,7 +46,7 @@ public class SystemLocalStorageController { private SystemLocalStorageService localStorageService; @ApiOperation("查询文件") - @PostMapping + @PostMapping(value = "/searchLocalStorage") @PreAuthorize("@el.check('storage:list')") public ResponseEntity> queryLocalStorage( @Validated @RequestBody KitPageArgs pageArgs) { 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 1dea13cb..7dd61513 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 @@ -77,15 +77,7 @@ public class SystemMenuController { return ResponseEntity.ok(ids); } - @PostMapping - @ApiOperation("查询菜单") - @PreAuthorize("@el.check('menu:list')") - public ResponseEntity> queryAllMenuByCrud( - @Validated @RequestBody KitPageArgs args) throws Exception { - return queryAllMenu(args); - } - - @PostMapping(value = "/queryMenuByArgs") + @PostMapping(value = "/queryAllMenu") @ApiOperation("查询菜单") @PreAuthorize("@el.check('menu:list')") public ResponseEntity> queryAllMenu( diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java index 0421ac23..50509048 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java @@ -44,12 +44,12 @@ public class SystemOnlineController { private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; @ApiOperation("查询在线用户") - @PostMapping + @PostMapping(value = "/searchOnlineUser") @PreAuthorize("@el.check()") public ResponseEntity> queryOnlineUser( @Validated @RequestBody KitPageArgs pageArgs) { IPage page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); - return ResponseEntity.ok(systemUserOnlineInfoDAO.queryUserOnlineModelPage(pageArgs.getArgs(), page)); + return ResponseEntity.ok(systemUserOnlineInfoDAO.searchOnlineUser(pageArgs.getArgs(), page)); } @ApiOperation("导出数据") 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 e08e4fb7..594f6d06 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 @@ -49,7 +49,7 @@ public class SystemOssStorageController { private SystemOssStorageService systemOssStorageService; @ApiOperation("查询文件") - @PostMapping + @PostMapping(value = "/searchOssStorage") @PreAuthorize("@el.check('storage:list')") public ResponseEntity> queryOssStorage( @Validated @RequestBody KitPageArgs pageArgs) { 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 31a1f1e2..ecfac555 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 @@ -50,7 +50,7 @@ public class SystemQuartzJobController { private SystemQuartzJobService systemQuartzJobService; @ApiOperation("查询定时任务") - @PostMapping + @PostMapping(value = "/searchQuartzJob") @PreAuthorize("@el.check('quartzJob:list')") public ResponseEntity> queryQuartzJobByCrud( @Validated @RequestBody KitPageArgs pageArgs) { @@ -73,7 +73,7 @@ public class SystemQuartzJobController { } @ApiOperation("查询任务执行日志") - @PostMapping(value = "/logs") + @PostMapping(value = "/searchQuartzLog") @PreAuthorize("@el.check('quartzJob:list')") public ResponseEntity> queryQuartzJobLog(SystemQueryQuartzJobArgs args) { Page page = new Page<>(args.getPage(), args.getSize()); @@ -89,7 +89,7 @@ public class SystemQuartzJobController { } @ApiOperation("修改定时任务") - @PutMapping + @PostMapping(value = "/updateQuartzJobResumeCron") @PreAuthorize("@el.check('quartzJob:edit')") public ResponseEntity updateQuartzJob( @Validated(SystemQuartzJobTb.Update.class) @RequestBody SystemUpdateQuartzJobArgs args) { 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 cc74b34e..e714c57a 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 { } @ApiOperation("查询角色") - @PostMapping + @PostMapping(value = "/searchRole") @PreAuthorize("@el.check('roles:list')") public ResponseEntity> queryRoleByArgs( @Validated @RequestBody KitPageArgs pageArgs) { @@ -79,9 +79,9 @@ public class SystemRoleController { } @ApiOperation("获取用户级别") - @PostMapping(value = "/queryRoleLevel") - public ResponseEntity queryRoleLevel() { - return ResponseEntity.ok(systemRoleService.getRoleLevel()); + @PostMapping(value = "/getCurrentUserRoleLevel") + public ResponseEntity getCurrentUserRoleLevel() { + return ResponseEntity.ok(systemRoleService.getCurrentUserRoleLevel()); } @ApiOperation("新增角色") 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 677b1d4c..09b4f8b0 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 @@ -60,7 +60,7 @@ public class SystemUserController { } @ApiOperation("查询用户") - @PostMapping + @PostMapping(value = "/aggregationSearchUserByArgs") @PreAuthorize("@el.check('user:list')") public ResponseEntity> queryUserByArgs(@Validated @RequestBody KitPageArgs pageArgs) { String currentUsername = KitSecurityHelper.getCurrentUsername(); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index 9a1749d9..fe3347f5 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java @@ -121,7 +121,7 @@ public class SystemUserOnlineInfoDAO { * @param pageable / * @return / */ - public KitPageResult queryUserOnlineModelPage(SystemUserOnlineVo onlineVo, + public KitPageResult searchOnlineUser(SystemUserOnlineVo onlineVo, IPage pageable) { String username = null; if (onlineVo != null) { 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 83b1a73a..a4443b21 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 @@ -255,7 +255,7 @@ public class SystemRoleService { return systemUserRoleService.convertToRoleVo(roleTb); } - public Dict getRoleLevel() { + public Dict getCurrentUserRoleLevel() { return Dict.create().set("level", checkRoleLevels(null)); }