Browse Source

完成系统日志切面

tsurumure 8 months ago
parent
commit
a9c2f90849

+ 8 - 1
db/sys_log.sql

@@ -9,7 +9,7 @@ CREATE TABLE `sys_log` (
     PRIMARY KEY (`id`),
     PRIMARY KEY (`id`),
     `id` BIGINT(10) NOT NULL AUTO_INCREMENT COMMENT 'ID',
     `id` BIGINT(10) NOT NULL AUTO_INCREMENT COMMENT 'ID',
     `username` VARCHAR(255) NOT NULL COMMENT '用户名',
     `username` VARCHAR(255) NOT NULL COMMENT '用户名',
-    `operation` VARCHAR(255) COMMENT '用户操作',
+    `action` VARCHAR(255) COMMENT '用户操作',
     `classname` VARCHAR(255) COMMENT '请求类名',
     `classname` VARCHAR(255) COMMENT '请求类名',
     `method` VARCHAR(255) COMMENT '请求方法',
     `method` VARCHAR(255) COMMENT '请求方法',
     `params` VARCHAR(5000) COMMENT '请求参数',
     `params` VARCHAR(5000) COMMENT '请求参数',
@@ -17,3 +17,10 @@ CREATE TABLE `sys_log` (
     `ip` VARCHAR(64) COMMENT 'IP',
     `ip` VARCHAR(64) COMMENT 'IP',
     `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
     `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
 ) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='系统日志';
 ) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='系统日志';
+
+INSERT INTO `sys_log` (`username`, `action`, `classname`, `method`,
+                       `params`, `time`, `ip`) VALUES
+    ('admin', '创建系统用户', 'com.backendsys.modules.system.controller.SysUserController', 'createUser',
+     '[{\"id\":52,\"username\":\"wangwu05\",\"password\":\"$2a$10$.2WbqVJ6q6fZAwinwBk5BuiDMVwd1DqgWJcowmOPt6Fxw.x5rlJ1O\",\"nickname\":\"王五05\",\"email\":\"ww12@qq.com\",\"phone\":\"18113128505\",\"gender\":1,\"avatar\":\"http://dummyimage.com/100x100\",\"role_id\":[2]}]', 62, '0:0:0:0:0:0:0:1')
+;
+

+ 1 - 1
src/main/java/com/backendsys/modules/common/aspect/SysLogAspect.java

@@ -50,7 +50,7 @@ public class SysLogAspect {
 		// 注解上的描述
 		// 注解上的描述
 		SysLog syslog = method.getAnnotation(SysLog.class);
 		SysLog syslog = method.getAnnotation(SysLog.class);
 		if(syslog != null){
 		if(syslog != null){
-			sysLogEntity.setOperation(syslog.value());
+			sysLogEntity.setAction(syslog.value());
 		}
 		}
 
 
 		// 请求方法名
 		// 请求方法名

+ 0 - 1
src/main/java/com/backendsys/modules/system/controller/SysLogController.java

@@ -2,7 +2,6 @@ package com.backendsys.modules.system.controller;
 
 
 import com.backendsys.modules.common.utils.Result;
 import com.backendsys.modules.common.utils.Result;
 import com.backendsys.modules.system.entity.SysLogEntity;
 import com.backendsys.modules.system.entity.SysLogEntity;
-import com.backendsys.modules.system.entity.SysUserDTO;
 import com.backendsys.modules.system.service.SysLogService;
 import com.backendsys.modules.system.service.SysLogService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 1 - 1
src/main/java/com/backendsys/modules/system/entity/SysLogEntity.java

@@ -12,7 +12,7 @@ public class SysLogEntity {
     @TableId(type = IdType.AUTO)
     @TableId(type = IdType.AUTO)
     private Long id;
     private Long id;
     private String username;
     private String username;
-    private String operation;
+    private String action;
     private String classname;
     private String classname;
     private String method;
     private String method;
     private String params;
     private String params;

+ 0 - 2
src/main/java/com/backendsys/modules/system/service/impl/SysLogServiceImpl.java

@@ -8,8 +8,6 @@ import com.backendsys.modules.system.service.SysLogService;
 import com.backendsys.utils.response.PageEntity;
 import com.backendsys.utils.response.PageEntity;
 import com.backendsys.utils.response.PageInfoResult;
 import com.backendsys.utils.response.PageInfoResult;
 import com.backendsys.utils.v2.PageUtils;
 import com.backendsys.utils.v2.PageUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

+ 4 - 4
src/main/resources/mapper/system/SysLogDao.xml

@@ -5,7 +5,7 @@
     <sql id="includeLog">
     <sql id="includeLog">
         id,
         id,
         username,
         username,
-        COALESCE(operation, '') operation,
+        COALESCE(action, '') action,
         COALESCE(classname, '') classname,
         COALESCE(classname, '') classname,
         COALESCE(method, '') method,
         COALESCE(method, '') method,
         COALESCE(params, '') params,
         COALESCE(params, '') params,
@@ -17,7 +17,7 @@
     <resultMap id="resultMapLogList" type="java.util.LinkedHashMap">
     <resultMap id="resultMapLogList" type="java.util.LinkedHashMap">
         <id property="id" column="id" jdbcType="BIGINT" />
         <id property="id" column="id" jdbcType="BIGINT" />
         <result property="username" column="username" />
         <result property="username" column="username" />
-        <result property="operation" column="operation" />
+        <result property="action" column="action" />
         <result property="classname" column="classname" />
         <result property="classname" column="classname" />
         <result property="method" column="method" />
         <result property="method" column="method" />
         <result property="params" column="params" />
         <result property="params" column="params" />
@@ -33,8 +33,8 @@
             <if test="username != null and username != ''">
             <if test="username != null and username != ''">
                 AND username LIKE CONCAT('%', #{username}, '%')
                 AND username LIKE CONCAT('%', #{username}, '%')
             </if>
             </if>
-            <if test="operation != null and operation != ''">
-                AND operation LIKE CONCAT('%', #{operation}, '%')
+            <if test="action != null and action != ''">
+                AND action LIKE CONCAT('%', #{action}, '%')
             </if>
             </if>
             <if test="ip != null and ip != ''">
             <if test="ip != null and ip != ''">
                 AND ip = #{ip}
                 AND ip = #{ip}