From 9d796da45fbef5c5a7b3644d6ada1c096d156dd9 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Wed, 20 Nov 2024 09:36:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=A1=E8=AE=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/framework/aspectj/LogAspect.java | 1 + .../framework/manager/factory/AsyncFactory.java | 10 ++++++++++ .../java/com/ruoyi/system/domain/SysLogininfor.java | 12 ++++++++++++ .../java/com/ruoyi/system/domain/SysOperLog.java | 11 +++++++++++ .../service/impl/SysLogininforServiceImpl.java | 3 +++ .../system/service/impl/SysOperLogServiceImpl.java | 3 +++ .../resources/mapper/system/SysLogininforMapper.xml | 9 ++++++--- .../resources/mapper/system/SysOperLogMapper.xml | 9 ++++++--- 8 files changed, 52 insertions(+), 6 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 25215b5..d8aaa32 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -98,6 +98,7 @@ public class LogAspect && StringUtils.isNotEmpty(currentUser.getDept().getDeptName())) { operLog.setDeptName(currentUser.getDept().getDeptName()); + operLog.setDeptId(currentUser.getDept().getDeptId()); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java index befa9ca..0df5409 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java @@ -1,6 +1,11 @@ package com.ruoyi.framework.manager.factory; +import java.util.Objects; import java.util.TimerTask; + +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.service.ISysUserService; +import lombok.val; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.ruoyi.common.constant.Constants; @@ -29,6 +34,7 @@ public class AsyncFactory { private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user"); + /** * 同步session到数据库 * @@ -111,6 +117,7 @@ public class AsyncFactory String os = userAgent.getOperatingSystem().getName(); // 获取客户端浏览器 String browser = userAgent.getBrowser().getName(); + SysUser sysUser = SpringUtils.getBean(ISysUserService.class).selectUserByLoginName(username); // 封装对象 SysLogininfor logininfor = new SysLogininfor(); logininfor.setLoginName(username); @@ -119,6 +126,9 @@ public class AsyncFactory logininfor.setBrowser(browser); logininfor.setOs(os); logininfor.setMsg(message); + if(Objects.nonNull(sysUser) && Objects.nonNull(sysUser.getDeptId())){ + logininfor.setDeptId(sysUser.getDeptId()); + } // 日志状态 if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index 29b3af1..2037351 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -52,6 +52,9 @@ public class SysLogininfor extends BaseEntity @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date loginTime; + + private Long deptId; + public Long getInfoId() { return infoId; @@ -142,6 +145,14 @@ public class SysLogininfor extends BaseEntity this.loginTime = loginTime; } + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -154,6 +165,7 @@ public class SysLogininfor extends BaseEntity .append("status", getStatus()) .append("msg", getMsg()) .append("loginTime", getLoginTime()) + .append("deptId", getDeptId()) .toString(); } } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index e758412..3476650 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -87,6 +87,8 @@ public class SysOperLog extends BaseEntity @Excel(name = "消耗时间", suffix = "毫秒") private Long costTime; + private Long deptId; + public Long getOperId() { return operId; @@ -267,6 +269,14 @@ public class SysOperLog extends BaseEntity this.costTime = costTime; } + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -287,6 +297,7 @@ public class SysOperLog extends BaseEntity .append("errorMsg", getErrorMsg()) .append("operTime", getOperTime()) .append("costTime", getCostTime()) + .append("deptId", getDeptId()) .toString(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index 983532f..f83a876 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.core.text.Convert; @@ -38,6 +40,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService * @return 登录记录集合 */ @Override + @DataScope(deptAlias = "d") public List selectLogininforList(SysLogininfor logininfor) { return logininforMapper.selectLogininforList(logininfor); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index aedb008..6edd7b6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.core.text.Convert; @@ -37,6 +39,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService * @return 操作日志集合 */ @Override + @DataScope(deptAlias = "d") public List selectOperLogList(SysOperLog operLog) { return operLogMapper.selectOperLogList(operLog); diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 9943c55..7dceabc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -14,15 +14,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - insert into sys_logininfor (login_name, status, ipaddr, login_location, browser, os, msg, login_time) - values (#{loginName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, now()) + insert into sys_logininfor (login_name, status, ipaddr, login_location, browser, os, msg, login_time,dept_id) + values (#{loginName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, now(),#{deptId}) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 68c16f9..d6f92c6 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -22,16 +22,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time - from sys_oper_log + from sys_oper_log d - insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time) - values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, now()) + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time,dept_id) + values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, now(),#{deptId})