sync -- 同步 RuoYi-Vue-Plus(v4.3.0) 更新

This commit is contained in:
konbai
2022-09-18 23:27:06 +08:00
parent 4bc7e08889
commit ccf8393808
254 changed files with 3697 additions and 2679 deletions

View File

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -25,7 +23,6 @@ import java.util.Map;
@Data
@TableName("sys_oper_log")
@ExcelIgnoreUnannotated
@ApiModel("操作日志记录业务对象")
public class SysOperLog implements Serializable {
private static final long serialVersionUID = 1L;
@@ -33,7 +30,6 @@ public class SysOperLog implements Serializable {
/**
* 日志主键
*/
@ApiModelProperty(value = "日志主键")
@ExcelProperty(value = "日志主键")
@TableId(value = "oper_id")
private Long operId;
@@ -41,14 +37,12 @@ public class SysOperLog implements Serializable {
/**
* 操作模块
*/
@ApiModelProperty(value = "操作模块")
@ExcelProperty(value = "操作模块")
private String title;
/**
* 业务类型0其它 1新增 2修改 3删除
*/
@ApiModelProperty(value = "业务类型0其它 1新增 2修改 3删除")
@ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_oper_type")
private Integer businessType;
@@ -56,28 +50,24 @@ public class SysOperLog implements Serializable {
/**
* 业务类型数组
*/
@ApiModelProperty(value = "业务类型数组")
@TableField(exist = false)
private Integer[] businessTypes;
/**
* 请求方法
*/
@ApiModelProperty(value = "请求方法")
@ExcelProperty(value = "请求方法")
private String method;
/**
* 请求方式
*/
@ApiModelProperty(value = "请求方式")
@ExcelProperty(value = "请求方式")
private String requestMethod;
/**
* 操作类别0其它 1后台用户 2手机端用户
*/
@ApiModelProperty(value = "操作类别0其它 1后台用户 2手机端用户")
@ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户")
private Integer operatorType;
@@ -85,56 +75,48 @@ public class SysOperLog implements Serializable {
/**
* 操作人员
*/
@ApiModelProperty(value = "操作人员")
@ExcelProperty(value = "操作人员")
private String operName;
/**
* 部门名称
*/
@ApiModelProperty(value = "部门名称")
@ExcelProperty(value = "部门名称")
private String deptName;
/**
* 请求url
*/
@ApiModelProperty(value = "请求url")
@ExcelProperty(value = "请求地址")
private String operUrl;
/**
* 操作地址
*/
@ApiModelProperty(value = "操作地址")
@ExcelProperty(value = "操作地址")
private String operIp;
/**
* 操作地点
*/
@ApiModelProperty(value = "操作地点")
@ExcelProperty(value = "操作地点")
private String operLocation;
/**
* 请求参数
*/
@ApiModelProperty(value = "请求参数")
@ExcelProperty(value = "请求参数")
private String operParam;
/**
* 返回参数
*/
@ApiModelProperty(value = "返回参数")
@ExcelProperty(value = "返回参数")
private String jsonResult;
/**
* 操作状态0正常 1异常
*/
@ApiModelProperty(value = "操作状态0正常 1异常")
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private Integer status;
@@ -142,21 +124,18 @@ public class SysOperLog implements Serializable {
/**
* 错误消息
*/
@ApiModelProperty(value = "错误消息")
@ExcelProperty(value = "错误消息")
private String errorMsg;
/**
* 操作时间
*/
@ApiModelProperty(value = "操作时间")
@ExcelProperty(value = "操作时间")
private Date operTime;
/**
* 请求参数
*/
@ApiModelProperty(value = "请求参数")
@TableField(exist = false)
private Map<String, Object> params = new HashMap<>();