From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java | 354 +++++++++++++++++++++-------------------------------------
1 files changed, 129 insertions(+), 225 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
index a3c350f..a9dfe90 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
@@ -1,255 +1,159 @@
package com.ruoyi.system.api.domain;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* 操作日志记录表 oper_log
- *
+ *
* @author ruoyi
*/
-public class SysOperLog extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
+@Data
+@ApiModel
+@TableName("sys_oper_log")
+public class SysOperLog {
+ private static final long serialVersionUID = 1L;
- /** 日志主键 */
- @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
- private Long operId;
+ /**
+ * 日志主键
+ */
+ @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
+ @ApiModelProperty("数据id")
+ @TableId(value = "oper_id", type = IdType.AUTO)
+ private Long operId;
- /** 操作模块 */
- @Excel(name = "操作模块")
- private String title;
+ /**
+ * 操作模块
+ */
+ @Excel(name = "操作模块")
+ @ApiModelProperty("操作模块")
+ private String title;
- /** 业务类型（0其它 1新增 2修改 3删除） */
- @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
- private Integer businessType;
+ /**
+ * 业务类型（0其它 1新增 2修改 3删除）
+ */
+ @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
+ @ApiModelProperty("0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
+ @TableField("business_type")
+ private Integer businessType;
- /** 业务类型数组 */
- private Integer[] businessTypes;
+ /**
+ * 业务类型数组
+ */
+ @TableField(exist = false)
+ private Integer[] businessTypes;
- /** 请求方法 */
- @Excel(name = "请求方法")
- private String method;
+ /**
+ * 请求方法
+ */
+ @Excel(name = "请求方法")
+ @ApiModelProperty("请求方法")
+ private String method;
- /** 请求方式 */
- @Excel(name = "请求方式")
- private String requestMethod;
+ /**
+ * 请求方式
+ */
+ @Excel(name = "请求方式")
+ @ApiModelProperty("请求方式")
+ @TableField("request_method")
+ private String requestMethod;
- /** 操作类别（0其它 1后台用户 2手机端用户） */
- @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
- private Integer operatorType;
+ /**
+ * 操作类别（0其它 1后台用户 2手机端用户）
+ */
+ @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
+ @ApiModelProperty("0=其它,1=后台用户,2=手机端用户")
+ @TableField("operator_type")
+ private Integer operatorType;
- /** 操作人员 */
- @Excel(name = "操作人员")
- private String operName;
+ /**
+ * 操作人员
+ */
+ @Excel(name = "操作人员")
+ @ApiModelProperty("操作人员")
+ @TableField("oper_name")
+ private String operName;
- /** 部门名称 */
- @Excel(name = "部门名称")
- private String deptName;
+ /**
+ * 部门名称
+ */
+ @Excel(name = "部门名称")
+ @ApiModelProperty("部门名称")
+ @TableField("dept_name")
+ private String deptName;
- /** 请求url */
- @Excel(name = "请求地址")
- private String operUrl;
+ /**
+ * 请求url
+ */
+ @Excel(name = "请求地址")
+ @ApiModelProperty("请求地址")
+ @TableField("oper_url")
+ private String operUrl;
- /** 操作地址 */
- @Excel(name = "操作地址")
- private String operIp;
+ /**
+ * 操作地址
+ */
+ @Excel(name = "操作地址")
+ @ApiModelProperty("操作地址")
+ @TableField("oper_ip")
+ private String operIp;
- /** 请求参数 */
- @Excel(name = "请求参数")
- private String operParam;
+ /**
+ * 请求参数
+ */
+ @Excel(name = "请求参数")
+ @ApiModelProperty("请求参数")
+ @TableField("oper_param")
+ private String operParam;
- /** 返回参数 */
- @Excel(name = "返回参数")
- private String jsonResult;
+ /**
+ * 返回参数
+ */
+ @Excel(name = "返回参数")
+ @ApiModelProperty("返回参数")
+ @TableField("json_result")
+ private String jsonResult;
- /** 操作状态（0正常 1异常） */
- @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
- private Integer status;
+ /**
+ * 操作状态（0正常 1异常）
+ */
+ @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
+ @ApiModelProperty("0=正常,1=异常")
+ private Integer status;
- /** 错误消息 */
- @Excel(name = "错误消息")
- private String errorMsg;
+ /**
+ * 错误消息
+ */
+ @Excel(name = "错误消息")
+ @ApiModelProperty("错误消息")
+ @TableField("error_msg")
+ private String errorMsg;
- /** 操作时间 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date operTime;
+ /**
+ * 操作时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("操作时间")
+ @TableField("oper_time")
+ private Date operTime;
- /** 消耗时间 */
- @Excel(name = "消耗时间", suffix = "毫秒")
- private Long costTime;
-
- public Long getOperId()
- {
- return operId;
- }
-
- public void setOperId(Long operId)
- {
- this.operId = operId;
- }
-
- public String getTitle()
- {
- return title;
- }
-
- public void setTitle(String title)
- {
- this.title = title;
- }
-
- public Integer getBusinessType()
- {
- return businessType;
- }
-
- public void setBusinessType(Integer businessType)
- {
- this.businessType = businessType;
- }
-
- public Integer[] getBusinessTypes()
- {
- return businessTypes;
- }
-
- public void setBusinessTypes(Integer[] businessTypes)
- {
- this.businessTypes = businessTypes;
- }
-
- public String getMethod()
- {
- return method;
- }
-
- public void setMethod(String method)
- {
- this.method = method;
- }
-
- public String getRequestMethod()
- {
- return requestMethod;
- }
-
- public void setRequestMethod(String requestMethod)
- {
- this.requestMethod = requestMethod;
- }
-
- public Integer getOperatorType()
- {
- return operatorType;
- }
-
- public void setOperatorType(Integer operatorType)
- {
- this.operatorType = operatorType;
- }
-
- public String getOperName()
- {
- return operName;
- }
-
- public void setOperName(String operName)
- {
- this.operName = operName;
- }
-
- public String getDeptName()
- {
- return deptName;
- }
-
- public void setDeptName(String deptName)
- {
- this.deptName = deptName;
- }
-
- public String getOperUrl()
- {
- return operUrl;
- }
-
- public void setOperUrl(String operUrl)
- {
- this.operUrl = operUrl;
- }
-
- public String getOperIp()
- {
- return operIp;
- }
-
- public void setOperIp(String operIp)
- {
- this.operIp = operIp;
- }
-
- public String getOperParam()
- {
- return operParam;
- }
-
- public void setOperParam(String operParam)
- {
- this.operParam = operParam;
- }
-
- public String getJsonResult()
- {
- return jsonResult;
- }
-
- public void setJsonResult(String jsonResult)
- {
- this.jsonResult = jsonResult;
- }
-
- public Integer getStatus()
- {
- return status;
- }
-
- public void setStatus(Integer status)
- {
- this.status = status;
- }
-
- public String getErrorMsg()
- {
- return errorMsg;
- }
-
- public void setErrorMsg(String errorMsg)
- {
- this.errorMsg = errorMsg;
- }
-
- public Date getOperTime()
- {
- return operTime;
- }
-
- public void setOperTime(Date operTime)
- {
- this.operTime = operTime;
- }
-
- public Long getCostTime()
- {
- return costTime;
- }
-
- public void setCostTime(Long costTime)
- {
- this.costTime = costTime;
- }
+ /**
+ * 消耗时间
+ */
+ @Excel(name = "消耗时间", suffix = "毫秒")
+ @ApiModelProperty("消耗时间")
+ @TableField("cost_time")
+ private Long costTime;
}
--
Gitblit v1.7.1