From 0b956579c125f41f27d1e09ecae5853926ef19fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 15:48:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java
index d504007..638ff44 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysOperLog.java
@@ -1,10 +1,13 @@
package com.ruoyi.system.api.domain.poji.sys;
-import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.StringJoiner;
/**
* 操作日志记录表 oper_log
@@ -82,6 +85,9 @@
/** 消耗时间 */
@Excel(name = "消耗时间", suffix = "毫秒")
private Long costTime;
+
+ @Excel(name = "操作内容")
+ private String operContent;
public Long getOperId()
{
@@ -203,6 +209,7 @@
this.operParam = operParam;
}
+
public String getJsonResult()
{
return jsonResult;
@@ -252,4 +259,36 @@
{
this.costTime = costTime;
}
+
+ public String getOperContent() {
+ return operContent;
+ }
+
+ public void setOperContent(String operContent) {
+ this.operContent = operContent;
+ }
+
+ @Override
+ public String toString() {
+ return new StringJoiner(", ", SysOperLog.class.getSimpleName() + "[", "]")
+ .add("operId=" + operId)
+ .add("title='" + title + "'")
+ .add("businessType=" + businessType)
+ .add("businessTypes=" + Arrays.toString(businessTypes))
+ .add("method='" + method + "'")
+ .add("requestMethod='" + requestMethod + "'")
+ .add("operatorType=" + operatorType)
+ .add("operName='" + operName + "'")
+ .add("deptName='" + deptName + "'")
+ .add("operUrl='" + operUrl + "'")
+ .add("operIp='" + operIp + "'")
+ .add("operParam='" + operParam + "'")
+ .add("jsonResult='" + jsonResult + "'")
+ .add("status=" + status)
+ .add("errorMsg='" + errorMsg + "'")
+ .add("operTime=" + operTime)
+ .add("costTime=" + costTime)
+ .add("operContent='" + operContent + "'")
+ .toString();
+ }
}
--
Gitblit v1.7.1