From cd77cc2c1adda339db043bda25f001d72fa0b0cf Mon Sep 17 00:00:00 2001 From: jiangdingxuan Date: Tue, 9 Jan 2024 15:38:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A5=E5=BF=97=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/common/log/annotation/Log.java | 48 ---- .../dromara/common/log/aspect/LogAspect.java | 223 ------------------ .../common/log/enums/BusinessStatus.java | 18 -- .../common/log/enums/BusinessType.java | 58 ----- .../common/log/enums/OperatorType.java | 23 -- .../common/log/event/OperLogEvent.java | 115 --------- .../demo/controller/TestDemoController.java | 25 +- .../demo/controller/TestTreeController.java | 16 +- .../monitor/SysLogininforController.java | 10 +- .../monitor/SysOperlogController.java | 75 ------ .../monitor/SysUserOnlineController.java | 3 - .../system/SysClientController.java | 34 ++- .../system/SysConfigController.java | 12 +- .../controller/system/SysDeptController.java | 7 +- .../system/SysDictDataController.java | 16 +- .../system/SysDictTypeController.java | 11 +- .../controller/system/SysMenuController.java | 7 +- .../system/SysNoticeController.java | 5 - .../controller/system/SysPostController.java | 10 +- .../system/SysProfileController.java | 4 - .../controller/system/SysRoleController.java | 11 - .../controller/system/SysUserController.java | 10 - .../org/dromara/system/domain/SysOperLog.java | 115 --------- .../system/domain/bo/SysOperLogBo.java | 127 ---------- .../system/domain/vo/SysOperLogVo.java | 144 ----------- .../system/mapper/SysOperLogMapper.java | 14 -- .../system/service/ISysOperLogService.java | 54 ----- .../service/impl/SysOperLogServiceImpl.java | 146 ------------ .../mapper/system/SysOperLogMapper.xml | 7 - 29 files changed, 43 insertions(+), 1305 deletions(-) delete mode 100644 src/main/java/org/dromara/common/log/annotation/Log.java delete mode 100644 src/main/java/org/dromara/common/log/aspect/LogAspect.java delete mode 100644 src/main/java/org/dromara/common/log/enums/BusinessStatus.java delete mode 100644 src/main/java/org/dromara/common/log/enums/BusinessType.java delete mode 100644 src/main/java/org/dromara/common/log/enums/OperatorType.java delete mode 100644 src/main/java/org/dromara/common/log/event/OperLogEvent.java delete mode 100644 src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java delete mode 100644 src/main/java/org/dromara/system/domain/SysOperLog.java delete mode 100644 src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java delete mode 100644 src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java delete mode 100644 src/main/java/org/dromara/system/mapper/SysOperLogMapper.java delete mode 100644 src/main/java/org/dromara/system/service/ISysOperLogService.java delete mode 100644 src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java delete mode 100644 src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/src/main/java/org/dromara/common/log/annotation/Log.java b/src/main/java/org/dromara/common/log/annotation/Log.java deleted file mode 100644 index 2dced97..0000000 --- a/src/main/java/org/dromara/common/log/annotation/Log.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.dromara.common.log.annotation; - -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.log.enums.OperatorType; - -import java.lang.annotation.*; - -/** - * 自定义操作日志记录注解 - * - * @author ruoyi - */ -@Target({ElementType.PARAMETER, ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface Log { - /** - * 模块 - */ - String title() default ""; - - /** - * 功能 - */ - BusinessType businessType() default BusinessType.OTHER; - - /** - * 操作人类别 - */ - OperatorType operatorType() default OperatorType.MANAGE; - - /** - * 是否保存请求的参数 - */ - boolean isSaveRequestData() default true; - - /** - * 是否保存响应的参数 - */ - boolean isSaveResponseData() default true; - - - /** - * 排除指定的请求参数 - */ - String[] excludeParamNames() default {}; - -} diff --git a/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/src/main/java/org/dromara/common/log/aspect/LogAspect.java deleted file mode 100644 index 3210b97..0000000 --- a/src/main/java/org/dromara/common/log/aspect/LogAspect.java +++ /dev/null @@ -1,223 +0,0 @@ -package org.dromara.common.log.aspect; - -import cn.hutool.core.lang.Dict; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.ttl.TransmittableThreadLocal; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessStatus; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.common.satoken.utils.LoginHelper; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.time.StopWatch; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.AfterThrowing; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpMethod; -import org.springframework.validation.BindingResult; -import org.springframework.web.multipart.MultipartFile; - -import java.util.Collection; -import java.util.Map; -import java.util.StringJoiner; - -/** - * 操作日志记录处理 - * - * @author Lion Li - */ -@Slf4j -@Aspect -@Configuration -public class LogAspect { - - /** - * 排除敏感属性字段 - */ - public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" }; - - - /** - * 计算操作消耗时间 - */ - private static final ThreadLocal TIME_THREADLOCAL = new TransmittableThreadLocal<>(); - - /** - * 处理请求前执行 - */ - @Before(value = "@annotation(controllerLog)") - public void boBefore(JoinPoint joinPoint, Log controllerLog) { - StopWatch stopWatch = new StopWatch(); - TIME_THREADLOCAL.set(stopWatch); - stopWatch.start(); - } - - /** - * 处理完请求后执行 - * - * @param joinPoint 切点 - */ - @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult") - public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) { - handleLog(joinPoint, controllerLog, null, jsonResult); - } - - /** - * 拦截异常操作 - * - * @param joinPoint 切点 - * @param e 异常 - */ - @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e") - public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) { - handleLog(joinPoint, controllerLog, e, null); - } - - protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) { - try { - - // *========数据库日志=========*// - OperLogEvent operLog = new OperLogEvent(); - operLog.setTenantId(LoginHelper.getTenantId()); - operLog.setStatus(BusinessStatus.SUCCESS.ordinal()); - // 请求的地址 - String ip = ServletUtils.getClientIP(); - operLog.setOperIp(ip); - operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)); - LoginUser loginUser = LoginHelper.getLoginUser(); - operLog.setOperName(loginUser.getUsername()); - operLog.setDeptName(loginUser.getDeptName()); - - if (e != null) { - operLog.setStatus(BusinessStatus.FAIL.ordinal()); - operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000)); - } - // 设置方法名称 - String className = joinPoint.getTarget().getClass().getName(); - String methodName = joinPoint.getSignature().getName(); - operLog.setMethod(className + "." + methodName + "()"); - // 设置请求方式 - operLog.setRequestMethod(ServletUtils.getRequest().getMethod()); - // 处理设置注解上的参数 - getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult); - // 设置消耗时间 - StopWatch stopWatch = TIME_THREADLOCAL.get(); - stopWatch.stop(); - operLog.setCostTime(stopWatch.getTime()); - // 发布事件保存数据库 - SpringUtils.context().publishEvent(operLog); - } catch (Exception exp) { - // 记录本地异常日志 - log.error("异常信息:{}", exp.getMessage()); - exp.printStackTrace(); - } finally { - TIME_THREADLOCAL.remove(); - } - } - - /** - * 获取注解中对方法的描述信息 用于Controller层注解 - * - * @param log 日志 - * @param operLog 操作日志 - * @throws Exception - */ - public void getControllerMethodDescription(JoinPoint joinPoint, Log log, OperLogEvent operLog, Object jsonResult) throws Exception { - // 设置action动作 - operLog.setBusinessType(log.businessType().ordinal()); - // 设置标题 - operLog.setTitle(log.title()); - // 设置操作人类别 - operLog.setOperatorType(log.operatorType().ordinal()); - // 是否需要保存request，参数和值 - if (log.isSaveRequestData()) { - // 获取参数的信息，传入到数据库中。 - setRequestValue(joinPoint, operLog, log.excludeParamNames()); - } - // 是否需要保存response，参数和值 - if (log.isSaveResponseData() && ObjectUtil.isNotNull(jsonResult)) { - operLog.setJsonResult(StringUtils.substring(JsonUtils.toJsonString(jsonResult), 0, 2000)); - } - } - - /** - * 获取请求的参数，放到log中 - * - * @param operLog 操作日志 - * @throws Exception 异常 - */ - private void setRequestValue(JoinPoint joinPoint, OperLogEvent operLog, String[] excludeParamNames) throws Exception { - Map paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest()); - String requestMethod = operLog.getRequestMethod(); - if (MapUtil.isEmpty(paramsMap) - && HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)) { - String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames); - operLog.setOperParam(StringUtils.substring(params, 0, 2000)); - } else { - MapUtil.removeAny(paramsMap, EXCLUDE_PROPERTIES); - MapUtil.removeAny(paramsMap, excludeParamNames); - operLog.setOperParam(StringUtils.substring(JsonUtils.toJsonString(paramsMap), 0, 2000)); - } - } - - /** - * 参数拼装 - */ - private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames) { - StringJoiner params = new StringJoiner(" "); - if (ArrayUtil.isEmpty(paramsArray)) { - return params.toString(); - } - for (Object o : paramsArray) { - if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) { - String str = JsonUtils.toJsonString(o); - Dict dict = JsonUtils.parseMap(str); - if (MapUtil.isNotEmpty(dict)) { - MapUtil.removeAny(dict, EXCLUDE_PROPERTIES); - MapUtil.removeAny(dict, excludeParamNames); - str = JsonUtils.toJsonString(dict); - } - params.add(str); - } - } - return params.toString(); - } - - /** - * 判断是否需要过滤的对象。 - * - * @param o 对象信息。 - * @return 如果是需要过滤的对象，则返回true；否则返回false。 - */ - @SuppressWarnings("rawtypes") - public boolean isFilterObject(final Object o) { - Class clazz = o.getClass(); - if (clazz.isArray()) { - return clazz.getComponentType().isAssignableFrom(MultipartFile.class); - } else if (Collection.class.isAssignableFrom(clazz)) { - Collection collection = (Collection) o; - for (Object value : collection) { - return value instanceof MultipartFile; - } - } else if (Map.class.isAssignableFrom(clazz)) { - Map map = (Map) o; - for (Object value : map.values()) { - return value instanceof MultipartFile; - } - } - return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse - || o instanceof BindingResult; - } -} diff --git a/src/main/java/org/dromara/common/log/enums/BusinessStatus.java b/src/main/java/org/dromara/common/log/enums/BusinessStatus.java deleted file mode 100644 index d303dc3..0000000 --- a/src/main/java/org/dromara/common/log/enums/BusinessStatus.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.common.log.enums; - -/** - * 操作状态 - * - * @author ruoyi - */ -public enum BusinessStatus { - /** - * 成功 - */ - SUCCESS, - - /** - * 失败 - */ - FAIL, -} diff --git a/src/main/java/org/dromara/common/log/enums/BusinessType.java b/src/main/java/org/dromara/common/log/enums/BusinessType.java deleted file mode 100644 index 2d25ebb..0000000 --- a/src/main/java/org/dromara/common/log/enums/BusinessType.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.dromara.common.log.enums; - -/** - * 业务操作类型 - * - * @author ruoyi - */ -public enum BusinessType { - /** - * 其它 - */ - OTHER, - - /** - * 新增 - */ - INSERT, - - /** - * 修改 - */ - UPDATE, - - /** - * 删除 - */ - DELETE, - - /** - * 授权 - */ - GRANT, - - /** - * 导出 - */ - EXPORT, - - /** - * 导入 - */ - IMPORT, - - /** - * 强退 - */ - FORCE, - - /** - * 生成代码 - */ - GENCODE, - - /** - * 清空数据 - */ - CLEAN, -} diff --git a/src/main/java/org/dromara/common/log/enums/OperatorType.java b/src/main/java/org/dromara/common/log/enums/OperatorType.java deleted file mode 100644 index de9328b..0000000 --- a/src/main/java/org/dromara/common/log/enums/OperatorType.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.dromara.common.log.enums; - -/** - * 操作人类别 - * - * @author ruoyi - */ -public enum OperatorType { - /** - * 其它 - */ - OTHER, - - /** - * 后台用户 - */ - MANAGE, - - /** - * 手机端用户 - */ - MOBILE -} diff --git a/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/src/main/java/org/dromara/common/log/event/OperLogEvent.java deleted file mode 100644 index 0386192..0000000 --- a/src/main/java/org/dromara/common/log/event/OperLogEvent.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.dromara.common.log.event; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 操作日志事件 - * - * @author Lion Li - */ - -@Data -public class OperLogEvent implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 日志主键 - */ - private Long operId; - - /** - * 租户ID - */ - private String tenantId; - - /** - * 操作模块 - */ - private String title; - - /** - * 业务类型（0其它 1新增 2修改 3删除） - */ - private Integer businessType; - - /** - * 业务类型数组 - */ - private Integer[] businessTypes; - - /** - * 请求方法 - */ - private String method; - - /** - * 请求方式 - */ - private String requestMethod; - - /** - * 操作类别（0其它 1后台用户 2手机端用户） - */ - private Integer operatorType; - - /** - * 操作人员 - */ - private String operName; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 请求url - */ - private String operUrl; - - /** - * 操作地址 - */ - private String operIp; - - /** - * 操作地点 - */ - private String operLocation; - - /** - * 请求参数 - */ - private String operParam; - - /** - * 返回参数 - */ - private String jsonResult; - - /** - * 操作状态（0正常 1异常） - */ - private Integer status; - - /** - * 错误消息 - */ - private String errorMsg; - - /** - * 操作时间 - */ - private Date operTime; - - /** - * 消耗时间 - */ - private Long costTime; -} diff --git a/src/main/java/org/dromara/demo/controller/TestDemoController.java b/src/main/java/org/dromara/demo/controller/TestDemoController.java index f31c540..d057a98 100644 --- a/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/src/main/java/org/dromara/demo/controller/TestDemoController.java @@ -1,36 +1,34 @@ package org.dromara.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; +import org.dromara.common.excel.core.ExcelResult; +import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.web.core.BaseController; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.bo.TestDemoImportVo; import org.dromara.demo.domain.vo.TestDemoVo; import org.dromara.demo.service.ITestDemoService; -import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; - -import java.util.*; +import java.util.Arrays; +import java.util.List; import java.util.concurrent.TimeUnit; /** @@ -70,7 +68,6 @@ public class TestDemoController extends BaseController { * * @param file 导入文件 */ - @Log(title = "测试单表", businessType = BusinessType.IMPORT) @SaCheckPermission("demo:demo:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file) throws Exception { @@ -84,7 +81,6 @@ public class TestDemoController extends BaseController { * 导出测试单表列表 */ @SaCheckPermission("demo:demo:export") - @Log(title = "测试单表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(@Validated TestDemoBo bo, HttpServletResponse response) { List list = testDemoService.queryList(bo); @@ -111,7 +107,6 @@ public class TestDemoController extends BaseController { * 新增测试单表 */ @SaCheckPermission("demo:demo:add") - @Log(title = "测试单表", businessType = BusinessType.INSERT) @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "{repeat.submit.message}") @PostMapping() public R add(@RequestBody TestDemoBo bo) { @@ -125,7 +120,6 @@ public class TestDemoController extends BaseController { * 修改测试单表 */ @SaCheckPermission("demo:demo:edit") - @Log(title = "测试单表", businessType = BusinessType.UPDATE) @RepeatSubmit @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) { @@ -138,7 +132,6 @@ public class TestDemoController extends BaseController { * @param ids 测试ID串 */ @SaCheckPermission("demo:demo:remove") - @Log(title = "测试单表", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { diff --git a/src/main/java/org/dromara/demo/controller/TestTreeController.java b/src/main/java/org/dromara/demo/controller/TestTreeController.java index 5c55205..de61919 100644 --- a/src/main/java/org/dromara/demo/controller/TestTreeController.java +++ b/src/main/java/org/dromara/demo/controller/TestTreeController.java @@ -1,25 +1,23 @@ package org.dromara.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.web.core.BaseController; import org.dromara.demo.domain.bo.TestTreeBo; import org.dromara.demo.domain.vo.TestTreeVo; import org.dromara.demo.service.ITestTreeService; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import java.util.Arrays; import java.util.List; @@ -51,7 +49,6 @@ public class TestTreeController extends BaseController { * 导出测试树表列表 */ @SaCheckPermission("demo:tree:export") - @Log(title = "测试树表", businessType = BusinessType.EXPORT) @GetMapping("/export") public void export(@Validated TestTreeBo bo, HttpServletResponse response) { List list = testTreeService.queryList(bo); @@ -74,7 +71,6 @@ public class TestTreeController extends BaseController { * 新增测试树表 */ @SaCheckPermission("demo:tree:add") - @Log(title = "测试树表", businessType = BusinessType.INSERT) @RepeatSubmit @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) { @@ -85,7 +81,6 @@ public class TestTreeController extends BaseController { * 修改测试树表 */ @SaCheckPermission("demo:tree:edit") - @Log(title = "测试树表", businessType = BusinessType.UPDATE) @RepeatSubmit @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) { @@ -98,7 +93,6 @@ public class TestTreeController extends BaseController { * @param ids 测试树ID串 */ @SaCheckPermission("demo:tree:remove") - @Log(title = "测试树表", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { diff --git a/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java index 18e32d8..03ff488 100644 --- a/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java +++ b/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java @@ -1,11 +1,11 @@ package org.dromara.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.GlobalConstants; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.redis.utils.RedisUtils; @@ -13,8 +13,6 @@ import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysLogininforBo; import org.dromara.system.domain.vo.SysLogininforVo; import org.dromara.system.service.ISysLogininforService; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -45,7 +43,6 @@ public class SysLogininforController extends BaseController { /** * 导出系统访问记录列表 */ - @Log(title = "登录日志", businessType = BusinessType.EXPORT) @SaCheckPermission("monitor:logininfor:export") @PostMapping("/export") public void export(SysLogininforBo logininfor, HttpServletResponse response) { @@ -58,7 +55,6 @@ public class SysLogininforController extends BaseController { * @param infoIds 日志ids */ @SaCheckPermission("monitor:logininfor:remove") - @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") public R remove(@PathVariable Long[] infoIds) { return toAjax(logininforService.deleteLogininforByIds(infoIds)); @@ -68,7 +64,6 @@ public class SysLogininforController extends BaseController { * 清理系统访问记录 */ @SaCheckPermission("monitor:logininfor:remove") - @Log(title = "登录日志", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") public R clean() { logininforService.cleanLogininfor(); @@ -76,7 +71,6 @@ public class SysLogininforController extends BaseController { } @SaCheckPermission("monitor:logininfor:unlock") - @Log(title = "账户解锁", businessType = BusinessType.OTHER) @GetMapping("/unlock/{userName}") public R unlock(@PathVariable("userName") String userName) { String loginName = GlobalConstants.PWD_ERR_CNT_KEY + userName; diff --git a/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java deleted file mode 100644 index 575aba6..0000000 --- a/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.dromara.system.controller.monitor; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; -import org.dromara.system.service.ISysOperLogService; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import jakarta.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 操作日志记录 - * - * @author Lion Li - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/monitor/operlog") -public class SysOperlogController extends BaseController { - - private final ISysOperLogService operLogService; - - /** - * 获取操作日志记录列表 - */ - @SaCheckPermission("monitor:operlog:list") - @GetMapping("/list") - public TableDataInfo list(SysOperLogBo operLog, PageQuery pageQuery) { - return operLogService.selectPageOperLogList(operLog, pageQuery); - } - - /** - * 导出操作日志记录列表 - */ - @Log(title = "操作日志", businessType = BusinessType.EXPORT) - @SaCheckPermission("monitor:operlog:export") - @PostMapping("/export") - public void export(SysOperLogBo operLog, HttpServletResponse response) { - List list = operLogService.selectOperLogList(operLog); - ExcelUtil.exportExcel(list, "操作日志", SysOperLogVo.class, response); - } - - /** - * 批量删除操作日志记录 - * @param operIds 日志ids - */ - @Log(title = "操作日志", businessType = BusinessType.DELETE) - @SaCheckPermission("monitor:operlog:remove") - @DeleteMapping("/{operIds}") - public R remove(@PathVariable Long[] operIds) { - return toAjax(operLogService.deleteOperLogByIds(operIds)); - } - - /** - * 清理操作日志记录 - */ - @Log(title = "操作日志", businessType = BusinessType.CLEAN) - @SaCheckPermission("monitor:operlog:remove") - @DeleteMapping("/clean") - public R clean() { - operLogService.cleanOperLog(); - return R.ok(); - } -} diff --git a/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java index f8c3450..6e5b795 100644 --- a/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java @@ -10,8 +10,6 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.dto.UserOnlineDTO; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; @@ -79,7 +77,6 @@ public class SysUserOnlineController extends BaseController { * @param tokenId token值 */ @SaCheckPermission("monitor:online:forceLogout") - @Log(title = "在线用户", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") public R forceLogout(@PathVariable String tokenId) { try { diff --git a/src/main/java/org/dromara/system/controller/system/SysClientController.java b/src/main/java/org/dromara/system/controller/system/SysClientController.java index 61d30c7..d9c0d2a 100644 --- a/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/src/main/java/org/dromara/system/controller/system/SysClientController.java @@ -1,26 +1,25 @@ package org.dromara.system.controller.system; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.service.ISysClientService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysClientBo; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.system.service.ISysClientService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 客户端管理 @@ -49,7 +48,6 @@ public class SysClientController extends BaseController { * 导出客户端管理列表 */ @SaCheckPermission("system:client:export") - @Log(title = "客户端管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysClientBo bo, HttpServletResponse response) { List list = sysClientService.queryList(bo); @@ -72,7 +70,6 @@ public class SysClientController extends BaseController { * 新增客户端管理 */ @SaCheckPermission("system:client:add") - @Log(title = "客户端管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody SysClientBo bo) { @@ -83,7 +80,6 @@ public class SysClientController extends BaseController { * 修改客户端管理 */ @SaCheckPermission("system:client:edit") - @Log(title = "客户端管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody SysClientBo bo) { @@ -94,7 +90,6 @@ public class SysClientController extends BaseController { * 状态修改 */ @SaCheckPermission("system:client:edit") - @Log(title = "客户端管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysClientBo bo) { return toAjax(sysClientService.updateUserStatus(bo.getId(), bo.getStatus())); @@ -106,7 +101,6 @@ public class SysClientController extends BaseController { * @param ids 主键串 */ @SaCheckPermission("system:client:remove") - @Log(title = "客户端管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { diff --git a/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/src/main/java/org/dromara/system/controller/system/SysConfigController.java index c73c386..e22f981 100644 --- a/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/src/main/java/org/dromara/system/controller/system/SysConfigController.java @@ -1,18 +1,16 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysConfigBo; import org.dromara.system.domain.vo.SysConfigVo; import org.dromara.system.service.ISysConfigService; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -43,7 +41,6 @@ public class SysConfigController extends BaseController { /** * 导出参数配置列表 */ - @Log(title = "参数管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:config:export") @PostMapping("/export") public void export(SysConfigBo config, HttpServletResponse response) { @@ -76,7 +73,6 @@ public class SysConfigController extends BaseController { * 新增参数配置 */ @SaCheckPermission("system:config:add") - @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysConfigBo config) { if (!configService.checkConfigKeyUnique(config)) { @@ -90,7 +86,6 @@ public class SysConfigController extends BaseController { * 修改参数配置 */ @SaCheckPermission("system:config:edit") - @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysConfigBo config) { if (!configService.checkConfigKeyUnique(config)) { @@ -104,7 +99,6 @@ public class SysConfigController extends BaseController { * 根据参数键名修改参数配置 */ @SaCheckPermission("system:config:edit") - @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping("/updateByKey") public R updateByKey(@RequestBody SysConfigBo config) { configService.updateConfig(config); @@ -117,7 +111,6 @@ public class SysConfigController extends BaseController { * @param configIds 参数ID串 */ @SaCheckPermission("system:config:remove") - @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") public R remove(@PathVariable Long[] configIds) { configService.deleteConfigByIds(configIds); @@ -128,7 +121,6 @@ public class SysConfigController extends BaseController { * 刷新参数缓存 */ @SaCheckPermission("system:config:remove") - @Log(title = "参数管理", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") public R refreshCache() { configService.resetConfigCache(); diff --git a/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/src/main/java/org/dromara/system/controller/system/SysDeptController.java index 37082e1..8103cdc 100644 --- a/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -2,16 +2,14 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.vo.SysDeptVo; import org.dromara.system.service.ISysDeptService; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -71,7 +69,6 @@ public class SysDeptController extends BaseController { * 新增部门 */ @SaCheckPermission("system:dept:add") - @Log(title = "部门管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysDeptBo dept) { if (!deptService.checkDeptNameUnique(dept)) { @@ -84,7 +81,6 @@ public class SysDeptController extends BaseController { * 修改部门 */ @SaCheckPermission("system:dept:edit") - @Log(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysDeptBo dept) { Long deptId = dept.getDeptId(); @@ -109,7 +105,6 @@ public class SysDeptController extends BaseController { * @param deptId 部门ID */ @SaCheckPermission("system:dept:remove") - @Log(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") public R remove(@PathVariable Long deptId) { if (deptService.hasChildByDeptId(deptId)) { diff --git a/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/src/main/java/org/dromara/system/controller/system/SysDictDataController.java index cc8034e..094ef7c 100644 --- a/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/src/main/java/org/dromara/system/controller/system/SysDictDataController.java @@ -2,22 +2,20 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.service.ISysDictDataService; import org.dromara.system.service.ISysDictTypeService; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; @@ -47,7 +45,6 @@ public class SysDictDataController extends BaseController { /** * 导出字典数据列表 */ - @Log(title = "字典数据", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") public void export(SysDictDataBo dictData, HttpServletResponse response) { @@ -84,7 +81,6 @@ public class SysDictDataController extends BaseController { * 新增字典类型 */ @SaCheckPermission("system:dict:add") - @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysDictDataBo dict) { dictDataService.insertDictData(dict); @@ -95,7 +91,6 @@ public class SysDictDataController extends BaseController { * 修改保存字典类型 */ @SaCheckPermission("system:dict:edit") - @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysDictDataBo dict) { dictDataService.updateDictData(dict); @@ -108,7 +103,6 @@ public class SysDictDataController extends BaseController { * @param dictCodes 字典code串 */ @SaCheckPermission("system:dict:remove") - @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") public R remove(@PathVariable Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); diff --git a/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java index 67c1f51..18e2c5f 100644 --- a/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java @@ -1,18 +1,16 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDictTypeBo; import org.dromara.system.domain.vo.SysDictTypeVo; import org.dromara.system.service.ISysDictTypeService; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -43,7 +41,6 @@ public class SysDictTypeController extends BaseController { /** * 导出字典类型列表 */ - @Log(title = "字典类型", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") public void export(SysDictTypeBo dictType, HttpServletResponse response) { @@ -66,7 +63,6 @@ public class SysDictTypeController extends BaseController { * 新增字典类型 */ @SaCheckPermission("system:dict:add") - @Log(title = "字典类型", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysDictTypeBo dict) { if (!dictTypeService.checkDictTypeUnique(dict)) { @@ -80,7 +76,6 @@ public class SysDictTypeController extends BaseController { * 修改字典类型 */ @SaCheckPermission("system:dict:edit") - @Log(title = "字典类型", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysDictTypeBo dict) { if (!dictTypeService.checkDictTypeUnique(dict)) { @@ -96,7 +91,6 @@ public class SysDictTypeController extends BaseController { * @param dictIds 字典ID串 */ @SaCheckPermission("system:dict:remove") - @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") public R remove(@PathVariable Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); @@ -107,7 +101,6 @@ public class SysDictTypeController extends BaseController { * 刷新字典缓存 */ @SaCheckPermission("system:dict:remove") - @Log(title = "字典类型", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") public R refreshCache() { dictTypeService.resetDictCache(); diff --git a/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/src/main/java/org/dromara/system/controller/system/SysMenuController.java index e5daa0e..68c570f 100644 --- a/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -4,12 +4,11 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.lang.tree.Tree; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.TenantConstants; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.SysMenu; @@ -18,7 +17,6 @@ import org.dromara.system.domain.vo.MenuTreeSelectVo; import org.dromara.system.domain.vo.RouterVo; import org.dromara.system.domain.vo.SysMenuVo; import org.dromara.system.service.ISysMenuService; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -123,7 +121,6 @@ public class SysMenuController extends BaseController { */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:menu:add") - @Log(title = "菜单管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysMenuBo menu) { if (!menuService.checkMenuNameUnique(menu)) { @@ -139,7 +136,6 @@ public class SysMenuController extends BaseController { */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:menu:edit") - @Log(title = "菜单管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysMenuBo menu) { if (!menuService.checkMenuNameUnique(menu)) { @@ -159,7 +155,6 @@ public class SysMenuController extends BaseController { */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:menu:remove") - @Log(title = "菜单管理", businessType = BusinessType.DELETE) @DeleteMapping("/{menuId}") public R remove(@PathVariable("menuId") Long menuId) { if (menuService.hasChildByMenuId(menuId)) { diff --git a/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/src/main/java/org/dromara/system/controller/system/SysNoticeController.java index a0aa26e..e21825b 100644 --- a/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/src/main/java/org/dromara/system/controller/system/SysNoticeController.java @@ -4,8 +4,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.service.DictService; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; @@ -54,7 +52,6 @@ public class SysNoticeController extends BaseController { * 新增通知公告 */ @SaCheckPermission("system:notice:add") - @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysNoticeBo notice) { int rows = noticeService.insertNotice(notice); @@ -70,7 +67,6 @@ public class SysNoticeController extends BaseController { * 修改通知公告 */ @SaCheckPermission("system:notice:edit") - @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysNoticeBo notice) { return toAjax(noticeService.updateNotice(notice)); @@ -82,7 +78,6 @@ public class SysNoticeController extends BaseController { * @param noticeIds 公告ID串 */ @SaCheckPermission("system:notice:remove") - @Log(title = "通知公告", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") public R remove(@PathVariable Long[] noticeIds) { return toAjax(noticeService.deleteNoticeByIds(noticeIds)); diff --git a/src/main/java/org/dromara/system/controller/system/SysPostController.java b/src/main/java/org/dromara/system/controller/system/SysPostController.java index fe62fdb..65dc92f 100644 --- a/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/src/main/java/org/dromara/system/controller/system/SysPostController.java @@ -1,19 +1,17 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.vo.SysPostVo; import org.dromara.system.service.ISysPostService; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -44,7 +42,6 @@ public class SysPostController extends BaseController { /** * 导出岗位列表 */ - @Log(title = "岗位管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:post:export") @PostMapping("/export") public void export(SysPostBo post, HttpServletResponse response) { @@ -67,7 +64,6 @@ public class SysPostController extends BaseController { * 新增岗位 */ @SaCheckPermission("system:post:add") - @Log(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysPostBo post) { if (!postService.checkPostNameUnique(post)) { @@ -82,7 +78,6 @@ public class SysPostController extends BaseController { * 修改岗位 */ @SaCheckPermission("system:post:edit") - @Log(title = "岗位管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysPostBo post) { if (!postService.checkPostNameUnique(post)) { @@ -102,7 +97,6 @@ public class SysPostController extends BaseController { * @param postIds 岗位ID串 */ @SaCheckPermission("system:post:remove") - @Log(title = "岗位管理", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") public R remove(@PathVariable Long[] postIds) { return toAjax(postService.deletePostByIds(postIds)); diff --git a/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/src/main/java/org/dromara/system/controller/system/SysProfileController.java index 5756148..e0d8357 100644 --- a/src/main/java/org/dromara/system/controller/system/SysProfileController.java +++ b/src/main/java/org/dromara/system/controller/system/SysProfileController.java @@ -6,8 +6,6 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysUserBo; @@ -48,7 +46,6 @@ public class SysProfileController extends BaseController { /** * 修改用户 */ - @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping public R updateProfile(@RequestBody SysUserProfileBo profile) { SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class); @@ -72,7 +69,6 @@ public class SysProfileController extends BaseController { * @param bo 新旧密码 */ @ApiEncrypt - @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") public R updatePwd(@Validated @RequestBody SysUserPasswordBo bo) { SysUserVo user = userService.selectUserById(LoginHelper.getUserId()); diff --git a/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/src/main/java/org/dromara/system/controller/system/SysRoleController.java index 3a9418b..e333cfe 100644 --- a/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -5,8 +5,6 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; @@ -52,7 +50,6 @@ public class SysRoleController extends BaseController { /** * 导出角色信息列表 */ - @Log(title = "角色管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:role:export") @PostMapping("/export") public void export(SysRoleBo role, HttpServletResponse response) { @@ -76,7 +73,6 @@ public class SysRoleController extends BaseController { * 新增角色 */ @SaCheckPermission("system:role:add") - @Log(title = "角色管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysRoleBo role) { roleService.checkRoleAllowed(role); @@ -93,7 +89,6 @@ public class SysRoleController extends BaseController { * 修改保存角色 */ @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysRoleBo role) { roleService.checkRoleAllowed(role); @@ -115,7 +110,6 @@ public class SysRoleController extends BaseController { * 修改保存数据权限 */ @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") public R dataScope(@RequestBody SysRoleBo role) { roleService.checkRoleAllowed(role); @@ -127,7 +121,6 @@ public class SysRoleController extends BaseController { * 状态修改 */ @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysRoleBo role) { roleService.checkRoleAllowed(role); @@ -141,7 +134,6 @@ public class SysRoleController extends BaseController { * @param roleIds 角色ID串 */ @SaCheckPermission("system:role:remove") - @Log(title = "角色管理", businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") public R remove(@PathVariable Long[] roleIds) { return toAjax(roleService.deleteRoleByIds(roleIds)); @@ -178,7 +170,6 @@ public class SysRoleController extends BaseController { * 取消授权用户 */ @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") public R cancelAuthUser(@RequestBody SysUserRole userRole) { return toAjax(roleService.deleteAuthUser(userRole)); @@ -191,7 +182,6 @@ public class SysRoleController extends BaseController { * @param userIds 用户ID串 */ @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancelAll") public R cancelAuthUserAll(Long roleId, Long[] userIds) { return toAjax(roleService.deleteAuthUsers(roleId, userIds)); @@ -204,7 +194,6 @@ public class SysRoleController extends BaseController { * @param userIds 用户ID串 */ @SaCheckPermission("system:role:edit") - @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/selectAll") public R selectAuthUserAll(Long roleId, Long[] userIds) { roleService.checkRoleDataScope(roleId); diff --git a/src/main/java/org/dromara/system/controller/system/SysUserController.java b/src/main/java/org/dromara/system/controller/system/SysUserController.java index 67bb0eb..b288b06 100644 --- a/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -17,8 +17,6 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.encrypt.annotation.ApiEncrypt; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; @@ -69,7 +67,6 @@ public class SysUserController extends BaseController { /** * 导出用户列表 */ - @Log(title = "用户管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:user:export") @PostMapping("/export") public void export(SysUserBo user, HttpServletResponse response) { @@ -84,7 +81,6 @@ public class SysUserController extends BaseController { * @param file 导入文件 * @param updateSupport 是否更新已存在数据 */ - @Log(title = "用户管理", businessType = BusinessType.IMPORT) @SaCheckPermission("system:user:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { @@ -149,7 +145,6 @@ public class SysUserController extends BaseController { * 新增用户 */ @SaCheckPermission("system:user:add") - @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysUserBo user) { deptService.checkDeptDataScope(user.getDeptId()); @@ -168,7 +163,6 @@ public class SysUserController extends BaseController { * 修改用户 */ @SaCheckPermission("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysUserBo user) { userService.checkUserAllowed(user.getUserId()); @@ -190,7 +184,6 @@ public class SysUserController extends BaseController { * @param userIds 角色ID串 */ @SaCheckPermission("system:user:remove") - @Log(title = "用户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") public R remove(@PathVariable Long[] userIds) { if (ArrayUtil.contains(userIds, LoginHelper.getUserId())) { @@ -204,7 +197,6 @@ public class SysUserController extends BaseController { */ @ApiEncrypt @SaCheckPermission("system:user:resetPwd") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") public R resetPwd(@RequestBody SysUserBo user) { userService.checkUserAllowed(user.getUserId()); @@ -217,7 +209,6 @@ public class SysUserController extends BaseController { * 状态修改 */ @SaCheckPermission("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysUserBo user) { userService.checkUserAllowed(user.getUserId()); @@ -248,7 +239,6 @@ public class SysUserController extends BaseController { * @param roleIds 角色ID串 */ @SaCheckPermission("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.GRANT) @PutMapping("/authRole") public R insertAuthRole(Long userId, Long[] roleIds) { userService.checkUserDataScope(userId); diff --git a/src/main/java/org/dromara/system/domain/SysOperLog.java b/src/main/java/org/dromara/system/domain/SysOperLog.java deleted file mode 100644 index 41a8c59..0000000 --- a/src/main/java/org/dromara/system/domain/SysOperLog.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.dromara.system.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * 操作日志记录表 oper_log - * - * @author Lion Li - */ - -@Data -@TableName("sys_oper_log") -public class SysOperLog implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 日志主键 - */ - @TableId(value = "oper_id") - private Long operId; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 操作模块 - */ - private String title; - - /** - * 业务类型（0其它 1新增 2修改 3删除） - */ - private Integer businessType; - - /** - * 请求方法 - */ - private String method; - - /** - * 请求方式 - */ - private String requestMethod; - - /** - * 操作类别（0其它 1后台用户 2手机端用户） - */ - private Integer operatorType; - - /** - * 操作人员 - */ - private String operName; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 请求url - */ - private String operUrl; - - /** - * 操作地址 - */ - private String operIp; - - /** - * 操作地点 - */ - private String operLocation; - - /** - * 请求参数 - */ - private String operParam; - - /** - * 返回参数 - */ - private String jsonResult; - - /** - * 操作状态（0正常 1异常） - */ - private Integer status; - - /** - * 错误消息 - */ - private String errorMsg; - - /** - * 操作时间 - */ - private Date operTime; - - /** - * 消耗时间 - */ - private Long costTime; - -} diff --git a/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java deleted file mode 100644 index f16400a..0000000 --- a/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.dromara.system.domain.bo; - -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.domain.SysOperLog; -import io.github.linpeilie.annotations.AutoMapper; -import io.github.linpeilie.annotations.AutoMappers; -import lombok.Data; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * 操作日志记录业务对象 sys_oper_log - * - * @author Michelle.Chung - * @date 2023-02-07 - */ - -@Data -@AutoMappers({ - @AutoMapper(target = SysOperLog.class, reverseConvertGenerate = false), - @AutoMapper(target = OperLogEvent.class) -}) -public class SysOperLogBo { - - /** - * 日志主键 - */ - private Long operId; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 模块标题 - */ - private String title; - - /** - * 业务类型（0其它 1新增 2修改 3删除） - */ - private Integer businessType; - - /** - * 业务类型数组 - */ - private Integer[] businessTypes; - - /** - * 方法名称 - */ - private String method; - - /** - * 请求方式 - */ - private String requestMethod; - - /** - * 操作类别（0其它 1后台用户 2手机端用户） - */ - private Integer operatorType; - - /** - * 操作人员 - */ - private String operName; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 请求URL - */ - private String operUrl; - - /** - * 主机地址 - */ - private String operIp; - - /** - * 操作地点 - */ - private String operLocation; - - /** - * 请求参数 - */ - private String operParam; - - /** - * 返回参数 - */ - private String jsonResult; - - /** - * 操作状态（0正常 1异常） - */ - private Integer status; - - /** - * 错误消息 - */ - private String errorMsg; - - /** - * 操作时间 - */ - private Date operTime; - - /** - * 消耗时间 - */ - private Long costTime; - - /** - * 请求参数 - */ - private Map params = new HashMap<>(); - -} diff --git a/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java deleted file mode 100644 index d9eb71d..0000000 --- a/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.dromara.system.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysOperLog; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - -/** - * 操作日志记录视图对象 sys_oper_log - * - * @author Michelle.Chung - * @date 2023-02-07 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysOperLog.class) -public class SysOperLogVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 日志主键 - */ - @ExcelProperty(value = "日志主键") - private Long operId; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 模块标题 - */ - @ExcelProperty(value = "操作模块") - private String title; - - /** - * 业务类型（0其它 1新增 2修改 3删除） - */ - @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_oper_type") - private Integer businessType; - - /** - * 业务类型数组 - */ - private Integer[] businessTypes; - - /** - * 方法名称 - */ - @ExcelProperty(value = "请求方法") - private String method; - - /** - * 请求方式 - */ - @ExcelProperty(value = "请求方式") - private String requestMethod; - - /** - * 操作类别（0其它 1后台用户 2手机端用户） - */ - @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户") - private Integer operatorType; - - /** - * 操作人员 - */ - @ExcelProperty(value = "操作人员") - private String operName; - - /** - * 部门名称 - */ - @ExcelProperty(value = "部门名称") - private String deptName; - - /** - * 请求URL - */ - @ExcelProperty(value = "请求地址") - private String operUrl; - - /** - * 主机地址 - */ - @ExcelProperty(value = "操作地址") - private String operIp; - - /** - * 操作地点 - */ - @ExcelProperty(value = "操作地点") - private String operLocation; - - /** - * 请求参数 - */ - @ExcelProperty(value = "请求参数") - private String operParam; - - /** - * 返回参数 - */ - @ExcelProperty(value = "返回参数") - private String jsonResult; - - /** - * 操作状态（0正常 1异常） - */ - @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") - private Integer status; - - /** - * 错误消息 - */ - @ExcelProperty(value = "错误消息") - private String errorMsg; - - /** - * 操作时间 - */ - @ExcelProperty(value = "操作时间") - private Date operTime; - - /** - * 消耗时间 - */ - @ExcelProperty(value = "消耗时间") - private Long costTime; -} diff --git a/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java b/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java deleted file mode 100644 index 5d20404..0000000 --- a/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysOperLog; -import org.dromara.system.domain.vo.SysOperLogVo; - -/** - * 操作日志 数据层 - * - * @author Lion Li - */ -public interface SysOperLogMapper extends BaseMapperPlus { - -} diff --git a/src/main/java/org/dromara/system/service/ISysOperLogService.java b/src/main/java/org/dromara/system/service/ISysOperLogService.java deleted file mode 100644 index 9573510..0000000 --- a/src/main/java/org/dromara/system/service/ISysOperLogService.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.dromara.system.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; - -import java.util.List; - -/** - * 操作日志 服务层 - * - * @author Lion Li - */ -public interface ISysOperLogService { - - TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery); - - /** - * 新增操作日志 - * - * @param bo 操作日志对象 - */ - void insertOperlog(SysOperLogBo bo); - - /** - * 查询系统操作日志集合 - * - * @param operLog 操作日志对象 - * @return 操作日志集合 - */ - List selectOperLogList(SysOperLogBo operLog); - - /** - * 批量删除系统操作日志 - * - * @param operIds 需要删除的操作日志ID - * @return 结果 - */ - int deleteOperLogByIds(Long[] operIds); - - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * @return 操作日志对象 - */ - SysOperLogVo selectOperLogById(Long operId); - - /** - * 清空操作日志 - */ - void cleanOperLog(); -} diff --git a/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java deleted file mode 100644 index 2a76b82..0000000 --- a/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java +++ /dev/null @@ -1,146 +0,0 @@ -package org.dromara.system.service.impl; - -import cn.hutool.core.util.ArrayUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.domain.SysOperLog; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; -import org.dromara.system.mapper.SysOperLogMapper; -import org.dromara.system.service.ISysOperLogService; -import lombok.RequiredArgsConstructor; -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * 操作日志 服务层处理 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysOperLogServiceImpl implements ISysOperLogService { - - private final SysOperLogMapper baseMapper; - - /** - * 操作日志记录 - * - * @param operLogEvent 操作日志事件 - */ - @Async - @EventListener - public void recordOper(OperLogEvent operLogEvent) { - SysOperLogBo operLog = MapstructUtils.convert(operLogEvent, SysOperLogBo.class); - // 远程查询操作地点 - operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); - insertOperlog(operLog); - } - - @Override - public TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery) { - Map params = operLog.getParams(); - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(operLog.getOperIp()), SysOperLog::getOperIp, operLog.getOperIp()) - .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle()) - .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0, - SysOperLog::getBusinessType, operLog.getBusinessType()) - .func(f -> { - if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) { - f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); - } - }) - .eq(operLog.getStatus() != null, - SysOperLog::getStatus, operLog.getStatus()) - .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName()) - .between(params.get("beginTime") != null && params.get("endTime") != null, - SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime")); - if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { - pageQuery.setOrderByColumn("oper_id"); - pageQuery.setIsAsc("desc"); - } - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); - } - - /** - * 新增操作日志 - * - * @param bo 操作日志对象 - */ - @Override - public void insertOperlog(SysOperLogBo bo) { - SysOperLog operLog = MapstructUtils.convert(bo, SysOperLog.class); - operLog.setOperTime(new Date()); - baseMapper.insert(operLog); - } - - /** - * 查询系统操作日志集合 - * - * @param operLog 操作日志对象 - * @return 操作日志集合 - */ - @Override - public List selectOperLogList(SysOperLogBo operLog) { - Map params = operLog.getParams(); - return baseMapper.selectVoList(new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(operLog.getOperIp()), SysOperLog::getOperIp, operLog.getOperIp()) - .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle()) - .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0, - SysOperLog::getBusinessType, operLog.getBusinessType()) - .func(f -> { - if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) { - f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); - } - }) - .eq(operLog.getStatus() != null && operLog.getStatus() > 0, - SysOperLog::getStatus, operLog.getStatus()) - .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName()) - .between(params.get("beginTime") != null && params.get("endTime") != null, - SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime")) - .orderByDesc(SysOperLog::getOperId)); - } - - /** - * 批量删除系统操作日志 - * - * @param operIds 需要删除的操作日志ID - * @return 结果 - */ - @Override - public int deleteOperLogByIds(Long[] operIds) { - return baseMapper.deleteBatchIds(Arrays.asList(operIds)); - } - - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * @return 操作日志对象 - */ - @Override - public SysOperLogVo selectOperLogById(Long operId) { - return baseMapper.selectVoById(operId); - } - - /** - * 清空操作日志 - */ - @Override - public void cleanOperLog() { - baseMapper.delete(new LambdaQueryWrapper<>()); - } -} diff --git a/src/main/resources/mapper/system/SysOperLogMapper.xml b/src/main/resources/mapper/system/SysOperLogMapper.xml deleted file mode 100644 index 5ef14ee..0000000 --- a/src/main/resources/mapper/system/SysOperLogMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -