public/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-04-08 11:33:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "update 优化操作日志"

Browse Source 
This reverts commit bcc11dcc12.
This commit is contained in:
疯狂的狮子Li
2026-04-03 07:07:03 +00:00
committed by Gitee
parent bcc11dcc12
commit b2e07254f9
11 changed files with 118 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java
View File

@@ -83,7 +83,7 @@ public class SysUserOnlineController extends BaseController {
* @return 操作结果
*/
@SaCheckPermission("monitor:online:forceLogout")
@Log(title = "在线用户", businessType = BusinessType.FORCE_LOGOUT)
@Log(title = "在线用户", businessType = BusinessType.FORCE)
@RepeatSubmit()
@DeleteMapping("/{tokenId}")
public R<Void> forceLogout(@PathVariable String tokenId) {
@@ -120,7 +120,7 @@ public class SysUserOnlineController extends BaseController {
* @param tokenId token值
* @return 操作结果
*/
@Log(title = "在线设备", businessType = BusinessType.FORCE_LOGOUT)
@Log(title = "在线设备", businessType = BusinessType.FORCE)
@RepeatSubmit()
@DeleteMapping("/myself/{tokenId}")
public R<Void> remove(@PathVariable("tokenId") String tokenId) {

51
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java
View File

@@ -13,6 +13,7 @@ import java.time.LocalDateTime;
*
* @author Lion Li
*/
@Data
@TableName("sys_oper_log")
public class SysOperLog implements Serializable {
@@ -27,35 +28,15 @@ public class SysOperLog implements Serializable {
private Long operId;
/**
* 业务模块名称
* 操作模块
*/
private String module;
private String title;
/**
* 操作功能名称
*/
private String name;
/**
* 操作描述（备注）
*/
private String remark;
/**
* 标签（用于检索/分类）
*/
private String tags;
/**
* 业务类型
* 业务类型（0其它 1新增 2修改 3删除）
*/
private Integer businessType;
/**
* 操作渠道
*/
private Integer channel;
/**
* 请求方法
*/
@@ -72,20 +53,15 @@ public class SysOperLog implements Serializable {
private Integer operatorType;
/**
* 用户名
* 操作人员
*/
private String username;
private String operName;
/**
* 部门名称
*/
private String deptName;
/**
* 用户类型
*/
private String userType;
/**
* 请求url
*/
@@ -96,26 +72,11 @@ public class SysOperLog implements Serializable {
*/
private String operIp;
/**
* 设备类型
*/
private String deviceType;
/**
* 操作地点
*/
private String operLocation;
/**
* 浏览器类型
*/
private String browser;
/**
* 操作系统
*/
private String os;
/**
* 请求参数
*/

56
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java
View File

@@ -35,42 +35,22 @@ public class SysOperLogBo implements Serializable {
private Long operId;
/**
* 业务模块名称
* 模块标题
*/
private String module;
private String title;
/**
* 操作功能名称
*/
private String name;
/**
* 操作描述（备注）
*/
private String remark;
/**
* 标签（用于检索/分类）
*/
private String tags;
/**
* 业务类型
* 业务类型（0其它 1新增 2修改 3删除）
*/
private Integer businessType;
/**
* 操作渠道
*/
private Integer channel;
/**
* 业务类型数组
*/
private Integer[] businessTypes;
/**
* 请求方法
* 方法名称
*/
private String method;
@@ -85,9 +65,9 @@ public class SysOperLogBo implements Serializable {
private Integer operatorType;
/**
* 用户名
* 操作人员
*/
private String username;
private String operName;
/**
* 部门名称
@@ -95,40 +75,20 @@ public class SysOperLogBo implements Serializable {
private String deptName;
/**
* 用户类型
*/
private String userType;
/**
* 请求url
* 请求URL
*/
private String operUrl;
/**
* 操作地址
* 主机地址
*/
private String operIp;
/**
* 设备类型
*/
private String deviceType;
/**
* 操作地点
*/
private String operLocation;
/**
* 浏览器类型
*/
private String browser;
/**
* 操作系统
*/
private String os;
/**
* 请求参数
*/

10
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java
View File

@@ -1,6 +1,5 @@
package org.dromara.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -44,11 +43,10 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
@Async
@EventListener
public void recordOper(OperLogEvent operLogEvent) {
SysOperLog operLog = BeanUtil.copyProperties(operLogEvent, SysOperLog.class);
SysOperLogBo operLog = MapstructUtils.convert(operLogEvent, SysOperLogBo.class);
// 远程查询操作地点
operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
operLog.setOperTime(LocalDateTime.now());
baseMapper.insert(operLog);
insertOperlog(operLog);
}
/**
@@ -78,7 +76,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
Map<String, Object> params = operLog.getParams();
return new LambdaQueryWrapper<SysOperLog>()
.like(StringUtils.isNotBlank(operLog.getOperIp()), SysOperLog::getOperIp, operLog.getOperIp())
.like(StringUtils.isNotBlank(operLog.getModule()), SysOperLog::getModule, operLog.getModule())
.like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
.eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
SysOperLog::getBusinessType, operLog.getBusinessType())
.func(f -> {
@@ -88,7 +86,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
})
.eq(operLog.getStatus() != null,
SysOperLog::getStatus, operLog.getStatus())
.like(StringUtils.isNotBlank(operLog.getUsername()), SysOperLog::getUsername, operLog.getUsername())
.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"));
}