From df770879c80fc66b5942be32f62db34d3330e70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= Date: Mon, 22 May 2023 15:59:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/maku/message/controller/SmsPlatformController.java | 8 +++++++- .../java/net/maku/quartz/controller/ScheduleJobController.java | 7 +++++++ .../java/net/maku/system/controller/SysAttachmentController.java | 4 ++++ .../java/net/maku/system/controller/SysDictDataController.java | 5 +++++ .../java/net/maku/system/controller/SysDictTypeController.java | 5 +++++ .../java/net/maku/system/controller/SysFileUploadController.java | 3 +++ .../java/net/maku/system/controller/SysLogLoginController.java | 3 +++ .../main/java/net/maku/system/controller/SysMenuController.java | 5 +++++ .../main/java/net/maku/system/controller/SysOrgController.java | 5 +++++ .../main/java/net/maku/system/controller/SysParamsController.java | 5 +++++ .../main/java/net/maku/system/controller/SysPostController.java | 5 +++++ .../main/java/net/maku/system/controller/SysRoleController.java | 8 ++++++++ .../main/java/net/maku/system/controller/SysUserController.java | 8 ++++++++ 13 files changed, 70 insertions(+), 1 deletion(-) diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java index e5ad627..4d662e9 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java @@ -4,9 +4,11 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.ExceptionUtils; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.message.convert.SmsPlatformConvert; import net.maku.message.entity.SmsPlatformEntity; import net.maku.message.query.SmsPlatformQuery; @@ -59,6 +61,7 @@ public class SmsPlatformController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('sms:platform:save')") public Result save(@RequestBody SmsPlatformVO vo) { smsPlatformService.save(vo); @@ -68,6 +71,7 @@ public class SmsPlatformController { @PostMapping("send") @Operation(summary = "发送短信") + @OperateLog(type = OperateTypeEnum.OTHER) @PreAuthorize("hasAuthority('sms:platform:update')") public Result send(@RequestBody SmsSendVO vo) { SmsPlatformEntity entity = smsPlatformService.getById(vo.getId()); @@ -97,6 +101,7 @@ public class SmsPlatformController { @PutMapping @Operation(summary = "修改") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('sms:platform:update')") public Result update(@RequestBody @Valid SmsPlatformVO vo) { smsPlatformService.update(vo); @@ -106,6 +111,7 @@ public class SmsPlatformController { @DeleteMapping @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sms:platform:delete')") public Result delete(@RequestBody List idList) { smsPlatformService.delete(idList); diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java index 673b5f6..ae53e2f 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java @@ -9,6 +9,8 @@ import lombok.AllArgsConstructor; import net.maku.framework.common.exception.ServerException; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.quartz.convert.ScheduleJobConvert; import net.maku.quartz.entity.ScheduleJobEntity; import net.maku.quartz.query.ScheduleJobQuery; @@ -55,6 +57,7 @@ public class ScheduleJobController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('schedule:save')") public Result save(@RequestBody ScheduleJobVO vo) { if (!CronUtils.isValid(vo.getCronExpression())) { @@ -71,6 +74,7 @@ public class ScheduleJobController { @PutMapping @Operation(summary = "修改") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('schedule:update')") public Result update(@RequestBody @Valid ScheduleJobVO vo) { if (!CronUtils.isValid(vo.getCronExpression())) { @@ -87,6 +91,7 @@ public class ScheduleJobController { @DeleteMapping @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('schedule:delete')") public Result delete(@RequestBody List idList) { scheduleJobService.delete(idList); @@ -96,6 +101,7 @@ public class ScheduleJobController { @PutMapping("run") @Operation(summary = "立即执行") + @OperateLog(type = OperateTypeEnum.OTHER) @PreAuthorize("hasAuthority('schedule:run')") public Result run(@RequestBody ScheduleJobVO vo) { scheduleJobService.run(vo); @@ -105,6 +111,7 @@ public class ScheduleJobController { @PutMapping("change-status") @Operation(summary = "修改状态") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('schedule:update')") public Result changeStatus(@RequestBody ScheduleJobVO vo) { scheduleJobService.changeStatus(vo); diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java index c875a44..14cfd71 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java @@ -6,6 +6,8 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.system.query.SysAttachmentQuery; import net.maku.system.service.SysAttachmentService; import net.maku.system.vo.SysAttachmentVO; @@ -39,6 +41,7 @@ public class SysAttachmentController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('sys:attachment:save')") public Result save(@RequestBody SysAttachmentVO vo) { sysAttachmentService.save(vo); @@ -48,6 +51,7 @@ public class SysAttachmentController { @DeleteMapping @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:attachment:delete')") public Result delete(@RequestBody List idList) { sysAttachmentService.delete(idList); diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java index 3e6d1b5..40eebe4 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java @@ -6,6 +6,8 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.system.convert.SysDictDataConvert; import net.maku.system.entity.SysDictDataEntity; import net.maku.system.query.SysDictDataQuery; @@ -50,6 +52,7 @@ public class SysDictDataController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('sys:dict:save')") public Result save(@RequestBody @Valid SysDictDataVO vo) { sysDictDataService.save(vo); @@ -59,6 +62,7 @@ public class SysDictDataController { @PutMapping @Operation(summary = "修改") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('sys:dict:update')") public Result update(@RequestBody @Valid SysDictDataVO vo) { sysDictDataService.update(vo); @@ -68,6 +72,7 @@ public class SysDictDataController { @DeleteMapping @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:dict:delete')") public Result delete(@RequestBody List idList) { sysDictDataService.delete(idList); diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java index 36767bf..3d58526 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java @@ -6,6 +6,8 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.system.convert.SysDictTypeConvert; import net.maku.system.entity.SysDictTypeEntity; import net.maku.system.query.SysDictTypeQuery; @@ -62,6 +64,7 @@ public class SysDictTypeController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('sys:dict:save')") public Result save(@RequestBody @Valid SysDictTypeVO vo) { sysDictTypeService.save(vo); @@ -71,6 +74,7 @@ public class SysDictTypeController { @PutMapping @Operation(summary = "修改") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('sys:dict:update')") public Result update(@RequestBody @Valid SysDictTypeVO vo) { sysDictTypeService.update(vo); @@ -80,6 +84,7 @@ public class SysDictTypeController { @DeleteMapping @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:dict:delete')") public Result delete(@RequestBody List idList) { sysDictTypeService.delete(idList); diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysFileUploadController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysFileUploadController.java index e209a08..e875703 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysFileUploadController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysFileUploadController.java @@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.storage.service.StorageService; import net.maku.system.vo.SysFileUploadVO; import org.springframework.web.bind.annotation.PostMapping; @@ -27,6 +29,7 @@ public class SysFileUploadController { @PostMapping("upload") @Operation(summary = "上传") + @OperateLog(type = OperateTypeEnum.INSERT) public Result upload(@RequestParam("file") MultipartFile file) throws Exception { if (file.isEmpty()) { return Result.error("请选择需要上传的文件"); diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java index ded434d..e7d6745 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java @@ -6,6 +6,8 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.system.query.SysLogLoginQuery; import net.maku.system.service.SysLogLoginService; import net.maku.system.vo.SysLogLoginVO; @@ -39,6 +41,7 @@ public class SysLogLoginController { @GetMapping("export") @Operation(summary = "导出excel") + @OperateLog(type = OperateTypeEnum.EXPORT) @PreAuthorize("hasAuthority('sys:log:login')") public void export() { sysLogLoginService.export(); diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java index 78f3461..881cef2 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java @@ -7,6 +7,8 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.constant.Constant; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.framework.security.user.SecurityUser; import net.maku.framework.security.user.UserDetail; import net.maku.system.convert.SysMenuConvert; @@ -79,6 +81,7 @@ public class SysMenuController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('sys:menu:save')") public Result save(@RequestBody @Valid SysMenuVO vo) { sysMenuService.save(vo); @@ -88,6 +91,7 @@ public class SysMenuController { @PutMapping @Operation(summary = "修改") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('sys:menu:update')") public Result update(@RequestBody @Valid SysMenuVO vo) { sysMenuService.update(vo); @@ -97,6 +101,7 @@ public class SysMenuController { @DeleteMapping("{id}") @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:menu:delete')") public Result delete(@PathVariable("id") Long id) { // 判断是否有子菜单或按钮 diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java index 88c8d2a..2f9c1fc 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java @@ -6,6 +6,8 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.constant.Constant; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.system.convert.SysOrgConvert; import net.maku.system.entity.SysOrgEntity; import net.maku.system.service.SysOrgService; @@ -55,6 +57,7 @@ public class SysOrgController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('sys:org:save')") public Result save(@RequestBody @Valid SysOrgVO vo) { sysOrgService.save(vo); @@ -64,6 +67,7 @@ public class SysOrgController { @PutMapping @Operation(summary = "修改") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('sys:org:update')") public Result update(@RequestBody @Valid SysOrgVO vo) { sysOrgService.update(vo); @@ -73,6 +77,7 @@ public class SysOrgController { @DeleteMapping("{id}") @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:org:delete')") public Result delete(@PathVariable("id") Long id) { sysOrgService.delete(id); diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java index c0a632e..1d28b71 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java @@ -6,6 +6,8 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.system.convert.SysParamsConvert; import net.maku.system.entity.SysParamsEntity; import net.maku.system.query.SysParamsQuery; @@ -50,6 +52,7 @@ public class SysParamsController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('sys:params:all')") public Result save(@RequestBody SysParamsVO vo) { sysParamsService.save(vo); @@ -59,6 +62,7 @@ public class SysParamsController { @PutMapping @Operation(summary = "修改") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('sys:params:all')") public Result update(@RequestBody @Valid SysParamsVO vo) { sysParamsService.update(vo); @@ -68,6 +72,7 @@ public class SysParamsController { @DeleteMapping @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:params:all')") public Result delete(@RequestBody List idList) { sysParamsService.delete(idList); diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java index a4b9281..5dcf232 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java @@ -6,6 +6,8 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.system.convert.SysPostConvert; import net.maku.system.entity.SysPostEntity; import net.maku.system.query.SysPostQuery; @@ -59,6 +61,7 @@ public class SysPostController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('sys:post:save')") public Result save(@RequestBody SysPostVO vo) { sysPostService.save(vo); @@ -68,6 +71,7 @@ public class SysPostController { @PutMapping @Operation(summary = "修改") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('sys:post:update')") public Result update(@RequestBody @Valid SysPostVO vo) { sysPostService.update(vo); @@ -77,6 +81,7 @@ public class SysPostController { @DeleteMapping @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:post:delete')") public Result delete(@RequestBody List idList) { sysPostService.delete(idList); diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java index 1611bd5..e7e26c3 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java @@ -6,6 +6,8 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.framework.security.user.SecurityUser; import net.maku.framework.security.user.UserDetail; import net.maku.system.convert.SysRoleConvert; @@ -81,6 +83,7 @@ public class SysRoleController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('sys:role:save')") public Result save(@RequestBody @Valid SysRoleVO vo) { sysRoleService.save(vo); @@ -90,6 +93,7 @@ public class SysRoleController { @PutMapping @Operation(summary = "修改") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('sys:role:update')") public Result update(@RequestBody @Valid SysRoleVO vo) { sysRoleService.update(vo); @@ -99,6 +103,7 @@ public class SysRoleController { @PutMapping("data-scope") @Operation(summary = "数据权限") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('sys:role:update')") public Result dataScope(@RequestBody @Valid SysRoleDataScopeVO vo) { sysRoleService.dataScope(vo); @@ -108,6 +113,7 @@ public class SysRoleController { @DeleteMapping @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:role:delete')") public Result delete(@RequestBody List idList) { sysRoleService.delete(idList); @@ -136,6 +142,7 @@ public class SysRoleController { @DeleteMapping("user/{roleId}") @Operation(summary = "删除角色用户") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:role:update')") public Result userDelete(@PathVariable("roleId") Long roleId, @RequestBody List userIdList) { sysUserRoleService.deleteByUserIdList(roleId, userIdList); @@ -145,6 +152,7 @@ public class SysRoleController { @PostMapping("user/{roleId}") @Operation(summary = "分配角色给用户列表") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:role:update')") public Result userSave(@PathVariable("roleId") Long roleId, @RequestBody List userIdList) { sysUserRoleService.saveUserList(roleId, userIdList); diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java index 843a83d..337167e 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java @@ -7,6 +7,8 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; +import net.maku.framework.operatelog.annotations.OperateLog; +import net.maku.framework.operatelog.enums.OperateTypeEnum; import net.maku.framework.security.user.SecurityUser; import net.maku.framework.security.user.UserDetail; import net.maku.system.convert.SysUserConvert; @@ -80,6 +82,7 @@ public class SysUserController { @PutMapping("password") @Operation(summary = "修改密码") + @OperateLog(type = OperateTypeEnum.UPDATE) public Result password(@RequestBody @Valid SysUserPasswordVO vo) { // 原密码不正确 UserDetail user = SecurityUser.getUser(); @@ -95,6 +98,7 @@ public class SysUserController { @PostMapping @Operation(summary = "保存") + @OperateLog(type = OperateTypeEnum.INSERT) @PreAuthorize("hasAuthority('sys:user:save')") public Result save(@RequestBody @Valid SysUserVO vo) { // 新增密码不能为空 @@ -113,6 +117,7 @@ public class SysUserController { @PutMapping @Operation(summary = "修改") + @OperateLog(type = OperateTypeEnum.UPDATE) @PreAuthorize("hasAuthority('sys:user:update')") public Result update(@RequestBody @Valid SysUserVO vo) { // 如果密码不为空，则进行加密处理 @@ -129,6 +134,7 @@ public class SysUserController { @DeleteMapping @Operation(summary = "删除") + @OperateLog(type = OperateTypeEnum.DELETE) @PreAuthorize("hasAuthority('sys:user:delete')") public Result delete(@RequestBody List idList) { Long userId = SecurityUser.getUserId(); @@ -143,6 +149,7 @@ public class SysUserController { @PostMapping("import") @Operation(summary = "导入用户") + @OperateLog(type = OperateTypeEnum.IMPORT) @PreAuthorize("hasAuthority('sys:user:import')") public Result importExcel(@RequestParam("file") MultipartFile file) { if (file.isEmpty()) { @@ -155,6 +162,7 @@ public class SysUserController { @GetMapping("export") @Operation(summary = "导出用户") + @OperateLog(type = OperateTypeEnum.EXPORT) @PreAuthorize("hasAuthority('sys:user:export')") public void export() { sysUserService.export();