From 467b2a7d93861033b55c054955da465b2364a7ad Mon Sep 17 00:00:00 2001 From: Odboy Date: Tue, 30 Dec 2025 22:34:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(user):=20=E5=8A=A0=E5=85=A5=E5=AE=A1?= =?UTF-8?q?=E8=AE=A1=E6=97=A5=E5=BF=97=E3=80=81=E7=94=A8=E6=88=B7=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/system/user/center.vue | 14 +- .../system/constant/SystemYesOrNoChConst.java | 1 + .../controller/SystemAuthController.java | 16 --- .../controller/SystemCaptchaController.java | 15 ++- .../controller/SystemComponentController.java | 12 +- .../controller/SystemDeptController.java | 19 ++- .../controller/SystemDictController.java | 23 ++-- .../SystemDictDetailController.java | 21 ++- .../controller/SystemEmailController.java | 13 +- .../controller/SystemJobController.java | 25 ++-- .../SystemLocalStorageController.java | 18 ++- .../controller/SystemMenuController.java | 31 ++--- .../controller/SystemMonitorController.java | 6 +- .../controller/SystemOnlineController.java | 12 +- .../SystemOssStorageController.java | 16 ++- .../controller/SystemQuartzJobController.java | 25 ++-- .../controller/SystemRoleController.java | 33 +++-- .../controller/SystemUserController.java | 62 ++++++--- .../system/dal/dataobject/SystemDeptTb.java | 7 +- .../system/dal/dataobject/SystemJobTb.java | 2 +- .../system/dal/dataobject/SystemMenuTb.java | 2 +- .../system/dal/dataobject/SystemRoleTb.java | 2 +- .../system/dal/dataobject/SystemUserTb.java | 4 +- .../dal/redis/SystemUserOnlineInfoDAO.java | 2 +- .../framework/operalog/OperationLog.java | 38 ++++++ .../operalog/OperationLogAspect.java | 120 +++++++++++++++++ .../operalog/SystemOperationLogAspect.java | 122 ++++++++++++++++++ .../system/service/SystemDeptService.java | 6 +- .../system/service/SystemRoleService.java | 2 +- .../system/service/SystemUserService.java | 2 +- .../controller/SystemAuthController.java | 2 - .../controller/SystemCaptchaController.java | 3 + .../controller/SystemDeptController.java | 5 + .../controller/SystemDictController.java | 5 + .../SystemDictDetailController.java | 4 + .../controller/SystemEmailController.java | 5 +- .../controller/SystemJobController.java | 5 + .../SystemLocalStorageController.java | 10 +- .../controller/SystemMenuController.java | 5 + .../controller/SystemMonitorController.java | 2 + .../controller/SystemOnlineController.java | 8 +- .../SystemOssStorageController.java | 10 +- .../controller/SystemQuartzJobController.java | 15 ++- .../controller/SystemRoleController.java | 5 + .../controller/SystemUserController.java | 23 +++- 45 files changed, 580 insertions(+), 198 deletions(-) create mode 100644 cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLog.java create mode 100644 cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java create mode 100644 cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/SystemOperationLogAspect.java diff --git a/cutejava-front/src/views/system/user/center.vue b/cutejava-front/src/views/system/user/center.vue index 872500af..417f2d6e 100644 --- a/cutejava-front/src/views/system/user/center.vue +++ b/cutejava-front/src/views/system/user/center.vue @@ -98,15 +98,15 @@ - + - - + + getUserInfo() { - SystemUserInfoVo userInfoVo = systemAuthService.getCurrentUserInfoVo(); - 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-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java index 5834823e..bf11f569 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java @@ -17,6 +17,7 @@ package cn.odboy.system.controller; import cn.odboy.system.constant.SystemCaptchaBizEnum; import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -37,23 +38,25 @@ public class SystemCaptchaController { @Autowired private SystemEmailService systemEmailService; + @OperationLog @ApiOperation("重置邮箱, 发送验证码") - @PostMapping(value = "/sendResetEmailCaptcha") - public ResponseEntity sendResetEmailCaptcha(@RequestParam String email) { + @PostMapping(value = "/sendResetEmailCode") + public ResponseEntity sendResetEmailCode(@RequestParam String email) { systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_EMAIL_CODE, email); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("重置密码，发送验证码") - @PostMapping(value = "/sendResetPasswordCaptcha") - public ResponseEntity sendResetPasswordCaptcha(@RequestParam String email) { + @PostMapping(value = "/sendResetPasswordCode") + public ResponseEntity sendResetPasswordCode(@RequestParam String email) { systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_PWD_CODE, email); return ResponseEntity.ok(null); } @ApiOperation("验证码验证") - @PostMapping(value = "/checkEmailCaptcha") - public ResponseEntity checkEmailCaptcha(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) { + @PostMapping(value = "/verifyCode") + public ResponseEntity verifyCode(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) { systemEmailService.checkEmailCaptcha(args); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java index ffb123a7..8c3aa3ec 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java @@ -34,16 +34,16 @@ public class SystemComponentController { private SystemDeptService systemDeptService; @ApiOperation("查询部门下拉选择数据源") - @PostMapping(value = "/queryDeptSelectDataSource") + @PostMapping(value = "/listDeptSelectDataSource") @PreAuthorize("@el.check()") - public ResponseEntity queryDeptSelectDataSource() { - return ResponseEntity.ok(systemDeptService.queryDeptSelectDataSource()); + public ResponseEntity listDeptSelectDataSource() { + return ResponseEntity.ok(systemDeptService.listDeptSelectDataSource()); } @ApiOperation("查询部门下拉选择Pro数据源") - @PostMapping(value = "/queryDeptSelectProDataSource") + @PostMapping(value = "/listDeptSelectProDataSource") @PreAuthorize("@el.check()") - public ResponseEntity queryDeptSelectProDataSource() { - return ResponseEntity.ok(systemDeptService.queryDeptSelectProDataSource()); + public ResponseEntity listDeptSelectProDataSource() { + return ResponseEntity.ok(systemDeptService.listDeptSelectProDataSource()); } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java index c3449355..3463d912 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java @@ -20,6 +20,7 @@ import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.model.SystemCreateDeptArgs; import cn.odboy.system.dal.model.SystemQueryDeptArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDeptService; import cn.odboy.util.KitPageUtil; import io.swagger.annotations.Api; @@ -46,6 +47,7 @@ public class SystemDeptController { @Autowired private SystemDeptService systemDeptService; + @OperationLog @ApiOperation("导出部门数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('dept:list')") @@ -54,7 +56,7 @@ public class SystemDeptController { } @ApiOperation("查询部门") - @PostMapping + @PostMapping(value = "/searchDept") @PreAuthorize("@el.check('user:list','dept:list')") public ResponseEntity> queryDept( @Validated @RequestBody KitPageArgs pageArgs) throws Exception { @@ -63,13 +65,14 @@ public class SystemDeptController { } @ApiOperation("查询部门:根据ID获取同级与上级数据") - @PostMapping("/queryDeptSuperiorTree") + @PostMapping("/searchDeptTree") @PreAuthorize("@el.check('user:list','dept:list')") public ResponseEntity> queryDeptSuperiorTree(@RequestBody List ids, @RequestParam(defaultValue = "false") Boolean exclude) { return ResponseEntity.ok(systemDeptService.searchDeptTree(ids, exclude)); } + @OperationLog @ApiOperation("新增部门") @PostMapping(value = "/saveDept") @PreAuthorize("@el.check('dept:add')") @@ -78,18 +81,20 @@ public class SystemDeptController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改部门") - @PostMapping(value = "/modifyDept") + @PostMapping(value = "/updateDeptById") @PreAuthorize("@el.check('dept:edit')") - public ResponseEntity modifyDept(@Validated(SystemDeptTb.Update.class) @RequestBody SystemDeptTb args) { - systemDeptService.updateDept(args); + public ResponseEntity updateDeptById(@Validated(SystemDeptTb.Update.class) @RequestBody SystemDeptTb args) { + systemDeptService.updateDeptById(args); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除部门") - @PostMapping(value = "/removeDeptByIds") + @PostMapping(value = "/deleteDeptByIds") @PreAuthorize("@el.check('dept:del')") - public ResponseEntity removeDeptByIds(@RequestBody Set ids) { + public ResponseEntity deleteDeptByIds(@RequestBody Set ids) { systemDeptService.deleteDeptByIds(ids); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index f5b57b50..b139f01e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -20,7 +20,7 @@ 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.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -46,9 +46,8 @@ public class SystemDictController { @Autowired private SystemDictService systemDictService; - @Autowired - private SystemDictDetailService systemDictDetailService; + @OperationLog @ApiOperation("导出字典数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('dict:list')") @@ -56,15 +55,16 @@ public class SystemDictController { systemDictService.exportDictXlsx(response, args); } - @ApiOperation("查询字典") + @Deprecated + @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) { @@ -72,6 +72,7 @@ public class SystemDictController { return ResponseEntity.ok(systemDictService.searchDict(pageArgs.getArgs(), page)); } + @OperationLog @ApiOperation("新增字典") @PostMapping(value = "/saveDict") @PreAuthorize("@el.check('dict:add')") @@ -80,18 +81,20 @@ public class SystemDictController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改字典") - @PostMapping(value = "/modifyDictById") + @PostMapping(value = "/updateDictById") @PreAuthorize("@el.check('dict:edit')") - public ResponseEntity modifyDictById(@Validated(SystemDictTb.Update.class) @RequestBody SystemDictTb args) { + public ResponseEntity updateDictById(@Validated(SystemDictTb.Update.class) @RequestBody SystemDictTb args) { systemDictService.updateDictById(args); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除字典") - @PostMapping(value = "/removeDictByIds") + @PostMapping(value = "/deleteDictByIds") @PreAuthorize("@el.check('dict:del')") - public ResponseEntity removeDictByIds(@RequestBody Set ids) { + public ResponseEntity deleteDictByIds(@RequestBody Set ids) { systemDictService.deleteDictByIds(ids); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index 98d6bd89..3fa08d5b 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -21,6 +21,7 @@ import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.model.SystemCreateDictDetailArgs; import cn.odboy.system.dal.model.SystemDictDetailVo; import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDictDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -47,14 +48,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()); @@ -68,6 +62,7 @@ public class SystemDictDetailController { return ResponseEntity.ok(dictMap); } + @OperationLog @ApiOperation("新增字典详情") @PostMapping(value = "/saveDictDetail") @PreAuthorize("@el.check('dict:add')") @@ -76,19 +71,21 @@ public class SystemDictDetailController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改字典详情") - @PostMapping(value = "/modifyDictDetailById") + @PostMapping(value = "/updateDictDetailById") @PreAuthorize("@el.check('dict:edit')") - public ResponseEntity modifyDictDetailById( + public ResponseEntity updateDictDetailById( @Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) { systemDictDetailService.updateDictDetailById(args); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除字典详情") - @PostMapping(value = "/removeDictDetailById") + @PostMapping(value = "/deleteDictDetailById") @PreAuthorize("@el.check('dict:del')") - public ResponseEntity removeDictDetailById(@RequestBody SystemDictDetailTb args) { + public ResponseEntity deleteDictDetailById(@RequestBody SystemDictDetailTb args) { systemDictDetailService.deleteDictDetailById(args.getId()); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java index 9fc9ac2c..1d7f7abb 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java @@ -17,6 +17,7 @@ package cn.odboy.system.controller; import cn.odboy.system.dal.dataobject.SystemEmailConfigTb; import cn.odboy.system.dal.model.SystemSendEmailArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -45,17 +46,19 @@ public class SystemEmailController { return ResponseEntity.ok(systemEmailService.getLastEmailConfig()); } - @ApiOperation("配置邮件") - @PostMapping(value = "/modifyEmailConfig") - public ResponseEntity modifyEmailConfig(@Validated @RequestBody SystemEmailConfigTb emailConfig) + @OperationLog + @ApiOperation("修改邮箱配置") + @PostMapping(value = "/updateEmailConfigById") + public ResponseEntity updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig) throws Exception { systemEmailService.updateEmailConfigById(emailConfig); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("发送邮件") - @PostMapping(value = "/sendEmail") - public ResponseEntity sendEmail(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) { + @PostMapping(value = "/send") + public ResponseEntity send(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) { systemEmailService.sendEmail(sendEmailRequest); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java index 8877f379..dec7f439 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java @@ -20,6 +20,7 @@ import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.model.SystemCreateJobArgs; import cn.odboy.system.dal.model.SystemQueryJobArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -45,6 +46,7 @@ public class SystemJobController { @Autowired private SystemJobService systemJobService; + @OperationLog @ApiOperation("导出岗位数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('job:list')") @@ -52,8 +54,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 +63,7 @@ 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); - } - + @OperationLog @ApiOperation("新增岗位") @PostMapping(value = "/saveJob") @PreAuthorize("@el.check('job:add')") @@ -77,18 +72,20 @@ public class SystemJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改岗位") - @PostMapping(value = "/modifyJobById") + @PostMapping(value = "/updateJobById") @PreAuthorize("@el.check('job:edit')") - public ResponseEntity modifyJobById(@Validated(SystemJobTb.Update.class) @RequestBody SystemJobTb args) { + public ResponseEntity updateJobById(@Validated(SystemJobTb.Update.class) @RequestBody SystemJobTb args) { systemJobService.updateJobById(args); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除岗位") - @PostMapping(value = "/removeJobByIds") + @PostMapping(value = "/deleteJobByIds") @PreAuthorize("@el.check('job:del')") - public ResponseEntity removeJobByIds(@RequestBody Set ids) { + public ResponseEntity deleteJobByIds(@RequestBody Set ids) { systemJobService.deleteJobByIds(ids); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index 6bd3d93e..3fade377 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -19,6 +19,7 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemLocalStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -46,7 +47,7 @@ public class SystemLocalStorageController { private SystemLocalStorageService localStorageService; @ApiOperation("查询文件") - @PostMapping + @PostMapping(value = "/searchLocalStorage") @PreAuthorize("@el.check('storage:list')") public ResponseEntity> queryLocalStorage( @Validated @RequestBody KitPageArgs pageArgs) { @@ -54,13 +55,15 @@ public class SystemLocalStorageController { return ResponseEntity.ok(localStorageService.searchLocalStorage(pageArgs.getArgs(), page)); } - @ApiOperation("导出数据") + @OperationLog + @ApiOperation("导出本地存储记录数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { localStorageService.exportLocalStorageXlsx(response, args); } + @OperationLog @ApiOperation("上传文件") @PostMapping(value = "/uploadFile") @PreAuthorize("@el.check('storage:add')") @@ -69,6 +72,7 @@ public class SystemLocalStorageController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("上传图片") @PostMapping("/uploadPicture") public ResponseEntity uploadPicture(@RequestParam MultipartFile file) { @@ -76,16 +80,18 @@ public class SystemLocalStorageController { return ResponseEntity.ok(localStorage); } + @OperationLog @ApiOperation("修改文件") - @PostMapping(value = "/modifyLocalStorageById") + @PostMapping(value = "/updateLocalStorageById") @PreAuthorize("@el.check('storage:edit')") - public ResponseEntity modifyLocalStorageById(@Validated @RequestBody SystemLocalStorageTb args) { + public ResponseEntity updateLocalStorageById(@Validated @RequestBody SystemLocalStorageTb args) { localStorageService.updateLocalStorageById(args); return ResponseEntity.ok(null); } - @ApiOperation("多选删除") - @PostMapping(value = "/removeFileByIds") + @OperationLog + @ApiOperation("删除文件") + @PostMapping(value = "/deleteFileByIds") public ResponseEntity deleteFileByIds(@RequestBody Long[] ids) { localStorageService.deleteFileByIds(ids); return ResponseEntity.ok(null); diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index 452acc3e..1cc58b40 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -21,6 +21,7 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.model.SystemMenuVo; import cn.odboy.system.dal.model.SystemQueryMenuArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemMenuService; import cn.odboy.util.KitPageUtil; import io.swagger.annotations.Api; @@ -47,6 +48,7 @@ public class SystemMenuController { @Autowired private SystemMenuService systemMenuService; + @OperationLog @ApiOperation("导出菜单数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('menu:list')") @@ -62,30 +64,22 @@ public class SystemMenuController { } @ApiOperation("返回全部的菜单") - @PostMapping(value = "/queryMenuListByPid") + @PostMapping(value = "/listMenuByPid") @PreAuthorize("@el.check('menu:list','roles:list')") - public ResponseEntity> queryMenuListByPid(@RequestParam Long pid) { + public ResponseEntity> listMenuByPid(@RequestParam Long pid) { List systemMenuTbs = systemMenuService.listMenuByPid(pid); return ResponseEntity.ok(systemMenuTbs); } @ApiOperation("根据菜单ID返回所有子节点ID, 包含自身ID") - @PostMapping(value = "/queryChildMenuSet") + @PostMapping(value = "/listChildMenuSetByMenuId") @PreAuthorize("@el.check('menu:list','roles:list')") - public ResponseEntity> queryChildMenuSet(@RequestParam Long id) { + public ResponseEntity> listChildMenuSetByMenuId(@RequestParam Long id) { Set ids = systemMenuService.listChildMenuSetByMenuId(id); 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 = "/searchMenu") @ApiOperation("查询菜单") @PreAuthorize("@el.check('menu:list')") public ResponseEntity> queryAllMenu( @@ -102,6 +96,7 @@ public class SystemMenuController { return ResponseEntity.ok(systemMenuTbs); } + @OperationLog @ApiOperation("新增菜单") @PostMapping(value = "/saveMenu") @PreAuthorize("@el.check('menu:add')") @@ -113,18 +108,20 @@ public class SystemMenuController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改菜单") - @PostMapping(value = "/modifyMenuById") + @PostMapping(value = "/updateMenuById") @PreAuthorize("@el.check('menu:edit')") - public ResponseEntity modifyMenuById(@Validated(SystemMenuTb.Update.class) @RequestBody SystemMenuTb args) { + public ResponseEntity updateMenuById(@Validated(SystemMenuTb.Update.class) @RequestBody SystemMenuTb args) { systemMenuService.updateMenuById(args); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除菜单") - @PostMapping(value = "/removeMenuByIds") + @PostMapping(value = "/deleteMenuByIds") @PreAuthorize("@el.check('menu:del')") - public ResponseEntity removeMenuByIds(@RequestBody Set ids) { + public ResponseEntity deleteMenuByIds(@RequestBody Set ids) { systemMenuService.deleteMenuByIds(ids); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java index 5b419e52..7f387c68 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java @@ -15,6 +15,7 @@ */ package cn.odboy.system.controller; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemMonitorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -34,10 +35,11 @@ public class SystemMonitorController { @Autowired private SystemMonitorService systemMonitorService; - @PostMapping(value = "/queryServerMonitorInfo") + @OperationLog + @PostMapping(value = "/getServerMonitorInfo") @ApiOperation("查询服务监控") @PreAuthorize("@el.check('monitor:list')") - public ResponseEntity> queryServerMonitorInfo() { + public ResponseEntity> getServerMonitorInfo() { return ResponseEntity.ok(systemMonitorService.getServerMonitorInfo()); } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java index 1b47c802..fea7e687 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java @@ -19,6 +19,7 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.model.SystemUserOnlineVo; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; +import cn.odboy.system.framework.operalog.OperationLog; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -43,23 +44,26 @@ public class SystemOnlineController { @Autowired private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; + @OperationLog @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("导出数据") + @OperationLog + @ApiOperation("导出在线用户数据") @GetMapping(value = "/download") @PreAuthorize("@el.check()") public void exportOnlineUser(HttpServletResponse response, String username) { systemUserOnlineInfoDAO.exportOnlineUserXlsx(response, username); } - @ApiOperation("踢出用户") + @OperationLog + @ApiOperation("踢出在线用户") @PostMapping(value = "/kickOutUser") @PreAuthorize("@el.check()") public ResponseEntity kickOutUser(@RequestBody Set keys) throws Exception { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java index 0d391ba9..acef9122 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java @@ -20,6 +20,7 @@ import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; import cn.odboy.system.dal.model.SystemOssStorageVo; import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemOssStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -49,7 +50,7 @@ public class SystemOssStorageController { private SystemOssStorageService systemOssStorageService; @ApiOperation("查询文件") - @PostMapping + @PostMapping(value = "/searchOssStorage") @PreAuthorize("@el.check('storage:list')") public ResponseEntity> queryOssStorage( @Validated @RequestBody KitPageArgs pageArgs) { @@ -57,14 +58,16 @@ public class SystemOssStorageController { return ResponseEntity.ok(systemOssStorageService.searchOssStorage(pageArgs.getArgs(), page)); } - @ApiOperation("导出数据") + @OperationLog + @ApiOperation("导出OSS存储记录数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { systemOssStorageService.exportOssStorageXlsx(response, args); } - @ApiOperation("上传文件") + @OperationLog + @ApiOperation("上传文件到OSS") @PostMapping(value = "/uploadFile") @PreAuthorize("@el.check('storage:add')") public ResponseEntity uploadFile(@RequestParam("file") MultipartFile file) { @@ -72,9 +75,10 @@ public class SystemOssStorageController { return ResponseEntity.ok(fileUrl); } - @ApiOperation("多选删除") - @PostMapping(value = "/removeFileByIds") - public ResponseEntity removeFileByIds(@RequestBody Long[] ids) { + @OperationLog + @ApiOperation("从OSS删除文件") + @PostMapping(value = "/deleteFileByIds") + public ResponseEntity deleteFileByIds(@RequestBody Long[] ids) { systemOssStorageService.deleteFileByIds(ids); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index 48a136f6..fab68a79 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -21,6 +21,7 @@ import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs; import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemQuartzJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -35,7 +36,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -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) { @@ -58,28 +58,31 @@ public class SystemQuartzJobController { return ResponseEntity.ok(systemQuartzJobService.searchQuartzJobByArgs(pageArgs.getArgs(), page)); } - @ApiOperation("导出任务数据") + @OperationLog + @ApiOperation("导出定时任务数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('quartzJob:list')") public void exportQuartzJob(HttpServletResponse response, SystemQueryQuartzJobArgs args) { systemQuartzJobService.exportQuartzJobXlsx(response, args); } - @ApiOperation("导出日志数据") + @OperationLog + @ApiOperation("导出定时任务日志数据") @GetMapping(value = "/logs/download") @PreAuthorize("@el.check('quartzJob:list')") public void exportQuartzJobLog(HttpServletResponse response, SystemQueryQuartzJobArgs args) { systemQuartzJobService.exportQuartzLogXlsx(response, args); } - @ApiOperation("查询任务执行日志") - @PostMapping(value = "/logs") + @ApiOperation("查询定时任务执行日志") + @PostMapping(value = "/searchQuartzLog") @PreAuthorize("@el.check('quartzJob:list')") public ResponseEntity> queryQuartzJobLog(SystemQueryQuartzJobArgs args) { Page page = new Page<>(args.getPage(), args.getSize()); return ResponseEntity.ok(systemQuartzJobService.searchQuartzLogByArgs(args, page)); } + @OperationLog @ApiOperation("新增定时任务") @PostMapping(value = "/createQuartzJob") @PreAuthorize("@el.check('quartzJob:add')") @@ -88,8 +91,9 @@ public class SystemQuartzJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改定时任务") - @PutMapping + @PostMapping(value = "/updateQuartzJobResumeCron") @PreAuthorize("@el.check('quartzJob:edit')") public ResponseEntity updateQuartzJob( @Validated(SystemQuartzJobTb.Update.class) @RequestBody SystemUpdateQuartzJobArgs args) { @@ -97,6 +101,7 @@ public class SystemQuartzJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("更改定时任务状态") @PostMapping(value = "/switchQuartzJobStatus/{id}") @PreAuthorize("@el.check('quartzJob:edit')") @@ -105,6 +110,7 @@ public class SystemQuartzJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("执行定时任务") @PostMapping(value = "/startQuartzJob/{id}") @PreAuthorize("@el.check('quartzJob:edit')") @@ -113,10 +119,11 @@ public class SystemQuartzJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除定时任务") - @PostMapping(value = "/removeJobByIds") + @PostMapping(value = "/deleteJobByIds") @PreAuthorize("@el.check('quartzJob:del')") - public ResponseEntity removeJobByIds(@RequestBody Set ids) { + public ResponseEntity deleteJobByIds(@RequestBody Set ids) { systemQuartzJobService.deleteJobByIds(ids); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index 36550e40..619cfd11 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -22,6 +22,7 @@ import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.model.SystemCreateRoleArgs; import cn.odboy.system.dal.model.SystemQueryRoleArgs; import cn.odboy.system.dal.model.SystemRoleVo; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -49,9 +50,9 @@ public class SystemRoleController { private SystemRoleService systemRoleService; @ApiOperation("获取单个role") - @PostMapping(value = "/queryRoleById") + @PostMapping(value = "/getRoleById") @PreAuthorize("@el.check('roles:list')") - public ResponseEntity queryRoleById(@RequestBody SystemRoleTb args) { + public ResponseEntity getRoleById(@RequestBody SystemRoleTb args) { return ResponseEntity.ok(systemRoleService.getRoleById(args.getId())); } @@ -63,14 +64,14 @@ public class SystemRoleController { } @ApiOperation("返回全部的角色") - @PostMapping(value = "/queryRoleList") + @PostMapping(value = "/listAllRole") @PreAuthorize("@el.check('roles:list','user:add','user:edit')") - public ResponseEntity> queryRoleList() { + public ResponseEntity> listAllRole() { return ResponseEntity.ok(systemRoleService.listAllRole()); } @ApiOperation("查询角色") - @PostMapping + @PostMapping(value = "/searchRole") @PreAuthorize("@el.check('roles:list')") public ResponseEntity> queryRoleByArgs( @Validated @RequestBody KitPageArgs pageArgs) { @@ -79,11 +80,12 @@ 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()); } + @OperationLog @ApiOperation("新增角色") @PostMapping(value = "/saveRole") @PreAuthorize("@el.check('roles:add')") @@ -92,26 +94,29 @@ public class SystemRoleController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改角色") - @PostMapping(value = "/modifyRoleById") + @PostMapping(value = "/updateRoleById") @PreAuthorize("@el.check('roles:edit')") - public ResponseEntity modifyRoleById(@Validated(SystemRoleTb.Update.class) @RequestBody SystemRoleVo args) { + public ResponseEntity updateRoleById(@Validated(SystemRoleTb.Update.class) @RequestBody SystemRoleVo args) { systemRoleService.updateRoleById(args); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改角色菜单") - @PostMapping(value = "/modifyBindMenuById") + @PostMapping(value = "/updateBindMenuById") @PreAuthorize("@el.check('roles:edit')") - public ResponseEntity modifyBindMenuById(@RequestBody SystemRoleVo args) { + public ResponseEntity updateBindMenuById(@RequestBody SystemRoleVo args) { systemRoleService.updateBindMenuById(args); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除角色") - @PostMapping(value = "/removeRoleByIds") + @PostMapping(value = "/deleteRoleByIds") @PreAuthorize("@el.check('roles:del')") - public ResponseEntity removeRoleByIds(@RequestBody Set ids) { + public ResponseEntity deleteRoleByIds(@RequestBody Set ids) { systemRoleService.deleteRoleByIds(ids); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index 08a33d70..2122da6c 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java @@ -21,8 +21,11 @@ import cn.odboy.base.KitSelectOptionVo; import cn.odboy.system.dal.dataobject.SystemUserTb; import cn.odboy.system.dal.model.SystemQueryUserArgs; import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs; +import cn.odboy.system.dal.model.SystemUserInfoVo; import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.framework.permission.core.KitSecurityHelper; +import cn.odboy.system.service.SystemAuthService; import cn.odboy.system.service.SystemUserService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -50,8 +53,10 @@ public class SystemUserController { @Autowired private SystemUserService systemUserService; + @Autowired + private SystemAuthService systemAuthService; - + @OperationLog @ApiOperation("导出用户数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('user:list')") @@ -60,7 +65,7 @@ public class SystemUserController { } @ApiOperation("查询用户") - @PostMapping + @PostMapping(value = "/aggregationSearchUser") @PreAuthorize("@el.check('user:list')") public ResponseEntity> queryUserByArgs(@Validated @RequestBody KitPageArgs pageArgs) { String currentUsername = KitSecurityHelper.getCurrentUsername(); @@ -68,6 +73,7 @@ public class SystemUserController { return ResponseEntity.ok(systemUserService.aggregationSearchUserByArgs(page, pageArgs.getArgs(), currentUsername)); } + @OperationLog @ApiOperation("新增用户") @PostMapping(value = "/saveUser") @PreAuthorize("@el.check('user:add')") @@ -76,53 +82,60 @@ public class SystemUserController { return ResponseEntity.ok(null); } - @ApiOperation("修改用户") - @PostMapping(value = "/modifyUserById") + @OperationLog + @ApiOperation("修改用户数据") + @PostMapping(value = "/updateUserById") @PreAuthorize("@el.check('user:edit')") - public ResponseEntity modifyUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) { + public ResponseEntity updateUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) { systemUserService.updateUserById(args); return ResponseEntity.ok(null); } - @ApiOperation("修改用户：个人中心") - @PostMapping(value = "modifyUserCenterInfoById") - public ResponseEntity modifyUserCenterInfoById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) { + @OperationLog + @ApiOperation("修改个人中心信息") + @PostMapping(value = "/updateUserCenterInfoById") + public ResponseEntity updateUserCenterInfoById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) { systemUserService.updateUserCenterInfoById(args); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除用户") - @PostMapping(value = "/removeUserByIds") + @PostMapping(value = "/deleteUserByIds") @PreAuthorize("@el.check('user:del')") - public ResponseEntity removeUserByIds(@RequestBody Set ids) { - systemUserService.removeUserByIds(ids); + public ResponseEntity deleteUserByIds(@RequestBody Set ids) { + systemUserService.deleteUserByIds(ids); return ResponseEntity.ok(null); } - @ApiOperation("修改密码") - @PostMapping(value = "/modifyUserPasswordByUsername") - public ResponseEntity modifyUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) throws Exception { + @OperationLog + @ApiOperation("修改用户密码") + @PostMapping(value = "/updateUserPasswordByUsername") + public ResponseEntity updateUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) throws Exception { String currentUsername = KitSecurityHelper.getCurrentUsername(); systemUserService.updateUserPasswordByUsername(currentUsername, passVo); return ResponseEntity.ok(null); } - @ApiOperation("重置密码") + @OperationLog + @ApiOperation("重置用户密码") @PostMapping(value = "/resetUserPasswordByIds") public ResponseEntity resetUserPasswordByIds(@RequestBody Set ids) { systemUserService.resetUserPasswordByIds(ids); return ResponseEntity.ok(null); } - @ApiOperation("修改头像") - @PostMapping(value = "/modifyUserAvatar") - public ResponseEntity modifyUserAvatar(@RequestParam MultipartFile avatar) { + @OperationLog + @ApiOperation("修改用户头像") + @PostMapping(value = "/updateUserAvatar") + public ResponseEntity updateUserAvatar(@RequestParam MultipartFile avatar) { return ResponseEntity.ok(systemUserService.updateUserAvatar(avatar)); } - @ApiOperation("修改邮箱") - @PostMapping(value = "/modifyUserEmailByUsername/{code}") - public ResponseEntity modifyUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) throws Exception { + @OperationLog + @ApiOperation("修改用户邮箱") + @PostMapping(value = "/updateUserEmailByUsername/{code}") + public ResponseEntity updateUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) throws Exception { String currentUsername = KitSecurityHelper.getCurrentUsername(); systemUserService.updateUserEmailByUsername(currentUsername, args, code); return ResponseEntity.ok(null); @@ -135,4 +148,11 @@ public class SystemUserController { List collect = systemUserService.queryUserMetadataOptions(args); return ResponseEntity.ok(collect); } + + @ApiOperation("获取用户信息") + @PostMapping(value = "/getCurrentUserInfo") + public ResponseEntity getUserInfo() { + SystemUserInfoVo userInfoVo = systemAuthService.getCurrentUserInfoVo(); + return ResponseEntity.ok(userInfoVo); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java index 40ce9625..0bd75d4f 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java @@ -22,11 +22,11 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Objects; import java.util.Set; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -42,8 +42,7 @@ public class SystemDeptTb extends KitBaseUserTimeTb { @TableField(exist = false) @JSONField(serialize = false) @ApiModelProperty(value = "角色") - private Set - roles; + private Set roles; @TableField(exist = false) @ApiModelProperty(value = "子部门") private List children; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java index 9a38ba8c..70f57a9b 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java @@ -20,9 +20,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import java.util.Objects; import lombok.Getter; import lombok.Setter; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java index 72fad6e2..1a4751fa 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java @@ -22,10 +22,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Objects; import java.util.Set; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java index cfe43e10..bb213601 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java @@ -23,9 +23,9 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import java.util.Objects; import lombok.Getter; import lombok.Setter; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java index 2c484bba..c96de1be 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java @@ -21,11 +21,11 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.Objects; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import java.util.Date; -import java.util.Objects; import lombok.Getter; import lombok.Setter; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index f4bc0676..c2dbe4ec 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava-springboot3/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-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLog.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLog.java new file mode 100644 index 00000000..a7486382 --- /dev/null +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLog.java @@ -0,0 +1,38 @@ +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.framework.operalog; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 捕捉操作日志 + * + * @author odboy + * @date 2025-05-12 + */ +@Inherited +@Documented +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface OperationLog { + + String bizName() default ""; +} diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java new file mode 100644 index 00000000..3b5c5519 --- /dev/null +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java @@ -0,0 +1,120 @@ +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.framework.operalog; + +import cn.hutool.core.date.TimeInterval; +import cn.hutool.core.exceptions.ExceptionUtil; +import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.StrUtil; +import cn.odboy.framework.context.KitRequestHolder; +import cn.odboy.system.dal.dataobject.SystemOperationLogTb; +import cn.odboy.system.dal.mysql.SystemOperationLogMapper; +import cn.odboy.system.framework.permission.core.KitSecurityHelper; +import cn.odboy.util.KitBrowserUtil; +import cn.odboy.util.KitIPUtil; +import com.alibaba.fastjson2.JSON; +import io.swagger.annotations.ApiOperation; +import java.lang.reflect.Method; +import jakarta.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 捕捉操作日志 + * + * @author odboy + * @date 2025-05-12 + */ +@Slf4j +@Aspect +@Component +public class OperationLogAspect { + + @Autowired + private SystemOperationLogMapper systemOperationLogMapper; + + @Around("@annotation(operationLog)") + public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable { + return handleLog(joinPoint, operationLog); + } + + private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable { + TimeInterval timeInterval = new TimeInterval(); + try { + Object result = joinPoint.proceed(); + SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval); + ThreadUtil.execAsync(() -> { + try { + systemOperationLogMapper.insert(record); + } catch (Exception e) { + // 忽略 + } + }); + return result; + } catch (Throwable exception) { + SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval); + record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception)); + ThreadUtil.execAsync(() -> { + try { + systemOperationLogMapper.insert(record); + } catch (Exception e) { + // 忽略 + } + }); + throw exception; + } + } + + private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation, + TimeInterval timeInterval) { + long executeTime = timeInterval.intervalMs(); + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + String bizName = annotation.bizName(); + if (StrUtil.isBlank(bizName)) { + Method method = signature.getMethod(); + ApiOperation apiOperation = method.getAnnotation(ApiOperation.class); + if (apiOperation != null) { + bizName = apiOperation.value(); + } + } + if (StrUtil.isBlank(bizName)) { + bizName = "默认业务"; + } + String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()"; + Object[] args = joinPoint.getArgs(); + String params = JSON.toJSONString(args); + HttpServletRequest request = KitRequestHolder.getHttpServletRequest(); + String requestIp = KitBrowserUtil.getIp(request); + String browserInfo = KitBrowserUtil.getVersion(request); + String address = KitIPUtil.getCityInfo(requestIp); + String username = KitSecurityHelper.getCurrentUsername(); + SystemOperationLogTb record = new SystemOperationLogTb(); + record.setBizName(bizName); + record.setMethod(method); + record.setParams(params); + record.setRequestIp(requestIp); + record.setExecuteTime(executeTime); + record.setUsername(username); + record.setAddress(address); + record.setBrowserInfo(browserInfo); + return record; + } +} diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/SystemOperationLogAspect.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/SystemOperationLogAspect.java new file mode 100644 index 00000000..a168de67 --- /dev/null +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/SystemOperationLogAspect.java @@ -0,0 +1,122 @@ +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.framework.operalog; + +import cn.hutool.core.date.TimeInterval; +import cn.hutool.core.exceptions.ExceptionUtil; +import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.StrUtil; +import cn.odboy.framework.context.KitRequestHolder; +import cn.odboy.system.dal.dataobject.SystemOperationLogTb; +import cn.odboy.system.dal.mysql.SystemOperationLogMapper; +import cn.odboy.system.framework.permission.core.KitSecurityHelper; +import cn.odboy.util.KitBrowserUtil; +import cn.odboy.util.KitIPUtil; +import com.alibaba.fastjson2.JSON; +import io.swagger.annotations.ApiOperation; +import java.lang.reflect.Method; +import jakarta.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 捕捉操作日志 + * + * @author odboy + * @date 2025-05-12 + */ +@Slf4j +@Aspect +@Component +public class SystemOperationLogAspect { + + @Autowired + private SystemOperationLogMapper systemOperationLogMapper; + + @Around("@annotation(operationLog)") + public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable { + return handleLog(joinPoint, operationLog); + } + + private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable { + TimeInterval timeInterval = new TimeInterval(); + try { + Object result = joinPoint.proceed(); + SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval); + ThreadUtil.execAsync(() -> { + try { + systemOperationLogMapper.insert(record); + } catch (Exception e) { + // log.error("保存审计日志失败", e); + // 忽略 + } + }); + return result; + } catch (Throwable exception) { + SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval); + record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception)); + ThreadUtil.execAsync(() -> { + try { + systemOperationLogMapper.insert(record); + } catch (Exception e) { + // log.error("保存审计日志失败", e); + // 忽略 + } + }); + throw exception; + } + } + + private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation, + TimeInterval timeInterval) { + long executeTime = timeInterval.intervalMs(); + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + String bizName = annotation.bizName(); + if (StrUtil.isBlank(bizName)) { + Method method = signature.getMethod(); + ApiOperation apiOperation = method.getAnnotation(ApiOperation.class); + if (apiOperation != null) { + bizName = apiOperation.value(); + } + } + if (StrUtil.isBlank(bizName)) { + bizName = "默认业务"; + } + String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()"; + Object[] args = joinPoint.getArgs(); + String params = JSON.toJSONString(args); + HttpServletRequest request = KitRequestHolder.getHttpServletRequest(); + String requestIp = KitBrowserUtil.getIp(request); + String browserInfo = KitBrowserUtil.getVersion(request); + String address = KitIPUtil.getCityInfo(requestIp); + String username = KitSecurityHelper.getCurrentUsername(); + SystemOperationLogTb record = new SystemOperationLogTb(); + record.setBizName(bizName); + record.setMethod(method); + record.setParams(params); + record.setRequestIp(requestIp); + record.setExecuteTime(executeTime); + record.setUsername(username); + record.setAddress(address); + record.setBrowserInfo(browserInfo); + return record; + } +} diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java index 62868016..84955cae 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java @@ -78,7 +78,7 @@ public class SystemDeptService { * @param args / */ @Transactional(rollbackFor = Exception.class) - public void updateDept(SystemDeptTb args) { + public void updateDeptById(SystemDeptTb args) { // 旧的部门 Long oldPid = this.getDeptById(args.getId()).getPid(); Long newPid = args.getPid(); @@ -365,7 +365,7 @@ public class SystemDeptService { return depts; } - public List queryDeptSelectDataSource() { + public List listDeptSelectDataSource() { List depts = this.listEnabledDepts(); return buildDeptSelectOptions(depts); } @@ -414,7 +414,7 @@ public class SystemDeptService { } } - public List queryDeptSelectProDataSource() { + public List listDeptSelectProDataSource() { List depts = this.listEnabledDepts(); // 获取所有部门并按父子关系组织 Map deptMap = diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 7092377c..3bf24191 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava-springboot3/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)); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java index 67e11fe4..61c64035 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java @@ -209,7 +209,7 @@ public class SystemUserService { * @param ids / */ @Transactional(rollbackFor = Exception.class) - public void removeUserByIds(Set ids) { + public void deleteUserByIds(Set ids) { Long currentUserId = KitSecurityHelper.getCurrentUserId(); // 校验权限 for (Long id : ids) { 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 3b12e572..11e72715 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 @@ -16,7 +16,6 @@ package cn.odboy.system.controller; import cn.odboy.annotation.AnonymousPostMapping; -import cn.odboy.system.dal.model.SystemUserInfoVo; import cn.odboy.system.dal.model.SystemUserLoginArgs; import cn.odboy.system.service.SystemAuthService; import io.swagger.annotations.Api; @@ -27,7 +26,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java index 6631aa70..1d033032 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java @@ -17,6 +17,7 @@ package cn.odboy.system.controller; import cn.odboy.system.constant.SystemCaptchaBizEnum; import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -37,6 +38,7 @@ public class SystemCaptchaController { @Autowired private SystemEmailService systemEmailService; + @OperationLog @ApiOperation("重置邮箱, 发送验证码") @PostMapping(value = "/sendResetEmailCode") public ResponseEntity sendResetEmailCode(@RequestParam String email) { @@ -44,6 +46,7 @@ public class SystemCaptchaController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("重置密码，发送验证码") @PostMapping(value = "/sendResetPasswordCode") public ResponseEntity sendResetPasswordCode(@RequestParam String email) { 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 48880e47..d66c4db4 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 @@ -20,6 +20,7 @@ import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.model.SystemCreateDeptArgs; import cn.odboy.system.dal.model.SystemQueryDeptArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDeptService; import cn.odboy.util.KitPageUtil; import io.swagger.annotations.Api; @@ -46,6 +47,7 @@ public class SystemDeptController { @Autowired private SystemDeptService systemDeptService; + @OperationLog @ApiOperation("导出部门数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('dept:list')") @@ -70,6 +72,7 @@ public class SystemDeptController { return ResponseEntity.ok(systemDeptService.searchDeptTree(ids, exclude)); } + @OperationLog @ApiOperation("新增部门") @PostMapping(value = "/saveDept") @PreAuthorize("@el.check('dept:add')") @@ -78,6 +81,7 @@ public class SystemDeptController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改部门") @PostMapping(value = "/updateDeptById") @PreAuthorize("@el.check('dept:edit')") @@ -86,6 +90,7 @@ public class SystemDeptController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除部门") @PostMapping(value = "/deleteDeptByIds") @PreAuthorize("@el.check('dept:del')") 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 58ba52f3..5a6592ef 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,6 +20,7 @@ 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.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -46,6 +47,7 @@ public class SystemDictController { @Autowired private SystemDictService systemDictService; + @OperationLog @ApiOperation("导出字典数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('dict:list')") @@ -70,6 +72,7 @@ public class SystemDictController { return ResponseEntity.ok(systemDictService.searchDict(pageArgs.getArgs(), page)); } + @OperationLog @ApiOperation("新增字典") @PostMapping(value = "/saveDict") @PreAuthorize("@el.check('dict:add')") @@ -78,6 +81,7 @@ public class SystemDictController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改字典") @PostMapping(value = "/updateDictById") @PreAuthorize("@el.check('dict:edit')") @@ -86,6 +90,7 @@ public class SystemDictController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除字典") @PostMapping(value = "/deleteDictByIds") @PreAuthorize("@el.check('dict:del')") 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 3089b238..b730861c 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 @@ -21,6 +21,7 @@ import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.model.SystemCreateDictDetailArgs; import cn.odboy.system.dal.model.SystemDictDetailVo; import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDictDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -61,6 +62,7 @@ public class SystemDictDetailController { return ResponseEntity.ok(dictMap); } + @OperationLog @ApiOperation("新增字典详情") @PostMapping(value = "/saveDictDetail") @PreAuthorize("@el.check('dict:add')") @@ -69,6 +71,7 @@ public class SystemDictDetailController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改字典详情") @PostMapping(value = "/updateDictDetailById") @PreAuthorize("@el.check('dict:edit')") @@ -78,6 +81,7 @@ public class SystemDictDetailController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除字典详情") @PostMapping(value = "/deleteDictDetailById") @PreAuthorize("@el.check('dict:del')") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java index 39e29274..bdcca4ab 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java @@ -17,6 +17,7 @@ package cn.odboy.system.controller; import cn.odboy.system.dal.dataobject.SystemEmailConfigTb; import cn.odboy.system.dal.model.SystemSendEmailArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -45,7 +46,8 @@ public class SystemEmailController { return ResponseEntity.ok(systemEmailService.getLastEmailConfig()); } - @ApiOperation("配置邮件") + @OperationLog + @ApiOperation("修改邮箱配置") @PostMapping(value = "/updateEmailConfigById") public ResponseEntity updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig) throws Exception { @@ -53,6 +55,7 @@ public class SystemEmailController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("发送邮件") @PostMapping(value = "/send") public ResponseEntity send(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) { 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 1976a91a..514f156a 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 @@ -20,6 +20,7 @@ import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.model.SystemCreateJobArgs; import cn.odboy.system.dal.model.SystemQueryJobArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -45,6 +46,7 @@ public class SystemJobController { @Autowired private SystemJobService systemJobService; + @OperationLog @ApiOperation("导出岗位数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('job:list')") @@ -61,6 +63,7 @@ public class SystemJobController { return ResponseEntity.ok(systemJobService.searchJobByArgs(pageArgs.getArgs(), page)); } + @OperationLog @ApiOperation("新增岗位") @PostMapping(value = "/saveJob") @PreAuthorize("@el.check('job:add')") @@ -69,6 +72,7 @@ public class SystemJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改岗位") @PostMapping(value = "/updateJobById") @PreAuthorize("@el.check('job:edit')") @@ -77,6 +81,7 @@ public class SystemJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除岗位") @PostMapping(value = "/deleteJobByIds") @PreAuthorize("@el.check('job:del')") 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 47575323..0740bf2f 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 @@ -19,6 +19,7 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemLocalStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -54,13 +55,15 @@ public class SystemLocalStorageController { return ResponseEntity.ok(localStorageService.searchLocalStorage(pageArgs.getArgs(), page)); } - @ApiOperation("导出数据") + @OperationLog + @ApiOperation("导出本地存储记录数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { localStorageService.exportLocalStorageXlsx(response, args); } + @OperationLog @ApiOperation("上传文件") @PostMapping(value = "/uploadFile") @PreAuthorize("@el.check('storage:add')") @@ -69,6 +72,7 @@ public class SystemLocalStorageController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("上传图片") @PostMapping("/uploadPicture") public ResponseEntity uploadPicture(@RequestParam MultipartFile file) { @@ -76,6 +80,7 @@ public class SystemLocalStorageController { return ResponseEntity.ok(localStorage); } + @OperationLog @ApiOperation("修改文件") @PostMapping(value = "/updateLocalStorageById") @PreAuthorize("@el.check('storage:edit')") @@ -84,7 +89,8 @@ public class SystemLocalStorageController { return ResponseEntity.ok(null); } - @ApiOperation("多选删除") + @OperationLog + @ApiOperation("删除文件") @PostMapping(value = "/deleteFileByIds") public ResponseEntity deleteFileByIds(@RequestBody Long[] ids) { localStorageService.deleteFileByIds(ids); 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 f3853cd8..9fce043a 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 @@ -21,6 +21,7 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.model.SystemMenuVo; import cn.odboy.system.dal.model.SystemQueryMenuArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemMenuService; import cn.odboy.util.KitPageUtil; import io.swagger.annotations.Api; @@ -47,6 +48,7 @@ public class SystemMenuController { @Autowired private SystemMenuService systemMenuService; + @OperationLog @ApiOperation("导出菜单数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('menu:list')") @@ -94,6 +96,7 @@ public class SystemMenuController { return ResponseEntity.ok(systemMenuTbs); } + @OperationLog @ApiOperation("新增菜单") @PostMapping(value = "/saveMenu") @PreAuthorize("@el.check('menu:add')") @@ -105,6 +108,7 @@ public class SystemMenuController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改菜单") @PostMapping(value = "/updateMenuById") @PreAuthorize("@el.check('menu:edit')") @@ -113,6 +117,7 @@ public class SystemMenuController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除菜单") @PostMapping(value = "/deleteMenuByIds") @PreAuthorize("@el.check('menu:del')") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java index 90da0c8d..de0fcf6a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java @@ -15,6 +15,7 @@ */ package cn.odboy.system.controller; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemMonitorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -34,6 +35,7 @@ public class SystemMonitorController { @Autowired private SystemMonitorService systemMonitorService; + @OperationLog @PostMapping(value = "/getServerMonitorInfo") @ApiOperation("查询服务监控") @PreAuthorize("@el.check('monitor:list')") 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 50509048..658a1bbc 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 @@ -19,6 +19,7 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.model.SystemUserOnlineVo; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; +import cn.odboy.system.framework.operalog.OperationLog; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -43,6 +44,7 @@ public class SystemOnlineController { @Autowired private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; + @OperationLog @ApiOperation("查询在线用户") @PostMapping(value = "/searchOnlineUser") @PreAuthorize("@el.check()") @@ -52,14 +54,16 @@ public class SystemOnlineController { return ResponseEntity.ok(systemUserOnlineInfoDAO.searchOnlineUser(pageArgs.getArgs(), page)); } - @ApiOperation("导出数据") + @OperationLog + @ApiOperation("导出在线用户数据") @GetMapping(value = "/download") @PreAuthorize("@el.check()") public void exportOnlineUser(HttpServletResponse response, String username) { systemUserOnlineInfoDAO.exportOnlineUserXlsx(response, username); } - @ApiOperation("踢出用户") + @OperationLog + @ApiOperation("踢出在线用户") @PostMapping(value = "/kickOutUser") @PreAuthorize("@el.check()") public ResponseEntity kickOutUser(@RequestBody Set keys) throws Exception { 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 c5a74ab7..6519135d 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 @@ -20,6 +20,7 @@ import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; import cn.odboy.system.dal.model.SystemOssStorageVo; import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemOssStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -57,14 +58,16 @@ public class SystemOssStorageController { return ResponseEntity.ok(systemOssStorageService.searchOssStorage(pageArgs.getArgs(), page)); } - @ApiOperation("导出数据") + @OperationLog + @ApiOperation("导出OSS存储记录数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { systemOssStorageService.exportOssStorageXlsx(response, args); } - @ApiOperation("上传文件") + @OperationLog + @ApiOperation("上传文件到OSS") @PostMapping(value = "/uploadFile") @PreAuthorize("@el.check('storage:add')") public ResponseEntity uploadFile(@RequestParam("file") MultipartFile file) { @@ -72,7 +75,8 @@ public class SystemOssStorageController { return ResponseEntity.ok(fileUrl); } - @ApiOperation("多选删除") + @OperationLog + @ApiOperation("从OSS删除文件") @PostMapping(value = "/deleteFileByIds") public ResponseEntity deleteFileByIds(@RequestBody Long[] ids) { systemOssStorageService.deleteFileByIds(ids); 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 7c9755e6..621dac5d 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 @@ -21,6 +21,7 @@ import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs; import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemQuartzJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -35,7 +36,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -58,21 +58,23 @@ public class SystemQuartzJobController { return ResponseEntity.ok(systemQuartzJobService.searchQuartzJobByArgs(pageArgs.getArgs(), page)); } - @ApiOperation("导出任务数据") + @OperationLog + @ApiOperation("导出定时任务数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('quartzJob:list')") public void exportQuartzJob(HttpServletResponse response, SystemQueryQuartzJobArgs args) { systemQuartzJobService.exportQuartzJobXlsx(response, args); } - @ApiOperation("导出日志数据") + @OperationLog + @ApiOperation("导出定时任务日志数据") @GetMapping(value = "/logs/download") @PreAuthorize("@el.check('quartzJob:list')") public void exportQuartzJobLog(HttpServletResponse response, SystemQueryQuartzJobArgs args) { systemQuartzJobService.exportQuartzLogXlsx(response, args); } - @ApiOperation("查询任务执行日志") + @ApiOperation("查询定时任务执行日志") @PostMapping(value = "/searchQuartzLog") @PreAuthorize("@el.check('quartzJob:list')") public ResponseEntity> queryQuartzJobLog(SystemQueryQuartzJobArgs args) { @@ -80,6 +82,7 @@ public class SystemQuartzJobController { return ResponseEntity.ok(systemQuartzJobService.searchQuartzLogByArgs(args, page)); } + @OperationLog @ApiOperation("新增定时任务") @PostMapping(value = "/createQuartzJob") @PreAuthorize("@el.check('quartzJob:add')") @@ -88,6 +91,7 @@ public class SystemQuartzJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改定时任务") @PostMapping(value = "/updateQuartzJobResumeCron") @PreAuthorize("@el.check('quartzJob:edit')") @@ -97,6 +101,7 @@ public class SystemQuartzJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("更改定时任务状态") @PostMapping(value = "/switchQuartzJobStatus/{id}") @PreAuthorize("@el.check('quartzJob:edit')") @@ -105,6 +110,7 @@ public class SystemQuartzJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("执行定时任务") @PostMapping(value = "/startQuartzJob/{id}") @PreAuthorize("@el.check('quartzJob:edit')") @@ -113,6 +119,7 @@ public class SystemQuartzJobController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除定时任务") @PostMapping(value = "/deleteJobByIds") @PreAuthorize("@el.check('quartzJob:del')") 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 c2723bc9..4e0eed44 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 @@ -22,6 +22,7 @@ import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.model.SystemCreateRoleArgs; import cn.odboy.system.dal.model.SystemQueryRoleArgs; import cn.odboy.system.dal.model.SystemRoleVo; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -84,6 +85,7 @@ public class SystemRoleController { return ResponseEntity.ok(systemRoleService.getCurrentUserRoleLevel()); } + @OperationLog @ApiOperation("新增角色") @PostMapping(value = "/saveRole") @PreAuthorize("@el.check('roles:add')") @@ -92,6 +94,7 @@ public class SystemRoleController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改角色") @PostMapping(value = "/updateRoleById") @PreAuthorize("@el.check('roles:edit')") @@ -100,6 +103,7 @@ public class SystemRoleController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("修改角色菜单") @PostMapping(value = "/updateBindMenuById") @PreAuthorize("@el.check('roles:edit')") @@ -108,6 +112,7 @@ public class SystemRoleController { return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除角色") @PostMapping(value = "/deleteRoleByIds") @PreAuthorize("@el.check('roles:del')") 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 5cdb8c16..34d8e05f 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 @@ -23,6 +23,7 @@ import cn.odboy.system.dal.model.SystemQueryUserArgs; import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs; import cn.odboy.system.dal.model.SystemUserInfoVo; import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.system.service.SystemAuthService; import cn.odboy.system.service.SystemUserService; @@ -55,7 +56,7 @@ public class SystemUserController { @Autowired private SystemAuthService systemAuthService; - + @OperationLog @ApiOperation("导出用户数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('user:list')") @@ -72,6 +73,7 @@ public class SystemUserController { return ResponseEntity.ok(systemUserService.aggregationSearchUserByArgs(page, pageArgs.getArgs(), currentUsername)); } + @OperationLog @ApiOperation("新增用户") @PostMapping(value = "/saveUser") @PreAuthorize("@el.check('user:add')") @@ -80,7 +82,8 @@ public class SystemUserController { return ResponseEntity.ok(null); } - @ApiOperation("修改用户") + @OperationLog + @ApiOperation("修改用户数据") @PostMapping(value = "/updateUserById") @PreAuthorize("@el.check('user:edit')") public ResponseEntity updateUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) { @@ -88,13 +91,15 @@ public class SystemUserController { return ResponseEntity.ok(null); } - @ApiOperation("修改用户：个人中心") + @OperationLog + @ApiOperation("修改个人中心信息") @PostMapping(value = "/updateUserCenterInfoById") public ResponseEntity updateUserCenterInfoById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) { systemUserService.updateUserCenterInfoById(args); return ResponseEntity.ok(null); } + @OperationLog @ApiOperation("删除用户") @PostMapping(value = "/deleteUserByIds") @PreAuthorize("@el.check('user:del')") @@ -103,7 +108,8 @@ public class SystemUserController { return ResponseEntity.ok(null); } - @ApiOperation("修改密码") + @OperationLog + @ApiOperation("修改用户密码") @PostMapping(value = "/updateUserPasswordByUsername") public ResponseEntity updateUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) throws Exception { String currentUsername = KitSecurityHelper.getCurrentUsername(); @@ -111,20 +117,23 @@ public class SystemUserController { return ResponseEntity.ok(null); } - @ApiOperation("重置密码") + @OperationLog + @ApiOperation("重置用户密码") @PostMapping(value = "/resetUserPasswordByIds") public ResponseEntity resetUserPasswordByIds(@RequestBody Set ids) { systemUserService.resetUserPasswordByIds(ids); return ResponseEntity.ok(null); } - @ApiOperation("修改头像") + @OperationLog + @ApiOperation("修改用户头像") @PostMapping(value = "/updateUserAvatar") public ResponseEntity updateUserAvatar(@RequestParam MultipartFile avatar) { return ResponseEntity.ok(systemUserService.updateUserAvatar(avatar)); } - @ApiOperation("修改邮箱") + @OperationLog + @ApiOperation("修改用户邮箱") @PostMapping(value = "/updateUserEmailByUsername/{code}") public ResponseEntity updateUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) throws Exception { String currentUsername = KitSecurityHelper.getCurrentUsername();