diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/dto/LogDTO.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/dto/LogDTO.java index b3250617..40641c80 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/dto/LogDTO.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/dto/LogDTO.java @@ -48,6 +48,8 @@ public class LogDTO implements Serializable { /**操作人用户账户*/ private String userid; + /**操作用户角色*/ + private String roleName; public LogDTO(){ diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java index 866e6227..309a383d 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java @@ -101,7 +101,7 @@ public class AutoLogAspect { if(sysUser!=null){ dto.setUserid(sysUser.getUsername()); dto.setUsername(sysUser.getRealname()); - + dto.setRoleName(sysUser.getRoleCode()); } //耗时 dto.setCostTime(time); diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/modules/base/mapper/xml/BaseCommonMapper.xml b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/modules/base/mapper/xml/BaseCommonMapper.xml index 203caeaf..5d796887 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/modules/base/mapper/xml/BaseCommonMapper.xml +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/modules/base/mapper/xml/BaseCommonMapper.xml @@ -4,7 +4,7 @@ - insert into sys_log (id, log_type, log_content, method, operate_type, request_param, ip, userid, username, cost_time, create_time) + insert into sys_log (id, log_type, log_content, method, operate_type, request_param, ip, userid, username,role_name, cost_time, create_time) values( #{dto.id,jdbcType=VARCHAR}, #{dto.logType,jdbcType=INTEGER}, @@ -15,6 +15,7 @@ #{dto.ip,jdbcType=VARCHAR}, #{dto.userid,jdbcType=VARCHAR}, #{dto.username,jdbcType=VARCHAR}, + #{dto.roleName,jdbcType=VARCHAR}, #{dto.costTime,jdbcType=BIGINT}, #{dto.createTime,jdbcType=TIMESTAMP} ) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/modules/base/service/impl/BaseCommonServiceImpl.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/modules/base/service/impl/BaseCommonServiceImpl.java index 8c93f605..bdda0d91 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/modules/base/service/impl/BaseCommonServiceImpl.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/modules/base/service/impl/BaseCommonServiceImpl.java @@ -70,6 +70,7 @@ public class BaseCommonServiceImpl implements BaseCommonService { if(user!=null){ sysLog.setUserid(user.getUsername()); sysLog.setUsername(user.getRealname()); + sysLog.setRoleName(user.getRoleCode()); } sysLog.setCreateTime(new Date()); //保存日志(异常捕获处理,防止数据太大存储失败,导致业务失败)JT-238 diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysLog.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysLog.java index 2e84df48..3a30d8f2 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysLog.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysLog.java @@ -92,6 +92,12 @@ public class SysLog implements Serializable { * 操作人用户账户 */ private String userid; + + /** + * 操作用户角色 + */ + @Dict(dicCode = "role_code",dictTable="sys_role",dicText="role_name") + private String roleName; /** * 操作详细日志 */