From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 192 +++++++++++++++++++----------------------------
1 files changed, 77 insertions(+), 115 deletions(-)
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 7fdea30..a157537 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
@@ -1,144 +1,106 @@
package com.ruoyi.system.domain;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+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 lombok.experimental.Accessors;
+
+import java.io.Serializable;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.HashMap;
+import java.util.Map;
/**
* 绯荤粺璁块棶璁板綍琛� sys_logininfor
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
-public class SysLogininfor extends BaseEntity
-{
+
+@Data
+@Accessors(chain = true)
+@TableName("sys_logininfor")
+@ExcelIgnoreUnannotated
+@ApiModel("绯荤粺璁块棶璁板綍涓氬姟瀵硅薄")
+public class SysLogininfor implements Serializable {
private static final long serialVersionUID = 1L;
- /** ID */
- @Excel(name = "搴忓彿", cellType = ColumnType.NUMERIC)
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "璁块棶ID")
+ @ExcelProperty(value = "搴忓彿")
+ @TableId(value = "info_id")
private Long infoId;
- /** 鐢ㄦ埛璐﹀彿 */
- @Excel(name = "鐢ㄦ埛璐﹀彿")
+ /**
+ * 鐢ㄦ埛璐﹀彿
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛璐﹀彿")
+ @ExcelProperty(value = "鐢ㄦ埛璐﹀彿")
private String userName;
- /** 鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触 */
- @Excel(name = "鐧诲綍鐘舵��", readConverterExp = "0=鎴愬姛,1=澶辫触")
+ /**
+ * 鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触
+ */
+ @ApiModelProperty(value = "鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触")
+ @ExcelProperty(value = "鐧诲綍鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_common_status")
private String status;
- /** 鐧诲綍IP鍦板潃 */
- @Excel(name = "鐧诲綍鍦板潃")
+ /**
+ * 鐧诲綍IP鍦板潃
+ */
+ @ApiModelProperty(value = "鐧诲綍IP鍦板潃")
+ @ExcelProperty(value = "鐧诲綍鍦板潃")
private String ipaddr;
- /** 鐧诲綍鍦扮偣 */
- @Excel(name = "鐧诲綍鍦扮偣")
+ /**
+ * 鐧诲綍鍦扮偣
+ */
+ @ApiModelProperty(value = "鐧诲綍鍦扮偣")
+ @ExcelProperty(value = "鐧诲綍鍦扮偣")
private String loginLocation;
- /** 娴忚鍣ㄧ被鍨� */
- @Excel(name = "娴忚鍣�")
+ /**
+ * 娴忚鍣ㄧ被鍨�
+ */
+ @ApiModelProperty(value = "娴忚鍣ㄧ被鍨�")
+ @ExcelProperty(value = "娴忚鍣�")
private String browser;
- /** 鎿嶄綔绯荤粺 */
- @Excel(name = "鎿嶄綔绯荤粺")
+ /**
+ * 鎿嶄綔绯荤粺
+ */
+ @ApiModelProperty(value = "鎿嶄綔绯荤粺")
+ @ExcelProperty(value = "鎿嶄綔绯荤粺")
private String os;
- /** 鎻愮ず娑堟伅 */
- @Excel(name = "鎻愮ず娑堟伅")
+ /**
+ * 鎻愮ず娑堟伅
+ */
+ @ApiModelProperty(value = "鎻愮ず娑堟伅")
+ @ExcelProperty(value = "鎻愮ず娑堟伅")
private String msg;
- /** 璁块棶鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁块棶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ /**
+ * 璁块棶鏃堕棿
+ */
+ @ApiModelProperty(value = "璁块棶鏃堕棿")
+ @ExcelProperty(value = "璁块棶鏃堕棿")
private Date loginTime;
- public Long getInfoId()
- {
- return infoId;
- }
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @ApiModelProperty(value = "璇锋眰鍙傛暟")
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
- public void setInfoId(Long infoId)
- {
- this.infoId = infoId;
- }
-
- public String getUserName()
- {
- return userName;
- }
-
- public void setUserName(String userName)
- {
- this.userName = userName;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getIpaddr()
- {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr)
- {
- this.ipaddr = ipaddr;
- }
-
- public String getLoginLocation()
- {
- return loginLocation;
- }
-
- public void setLoginLocation(String loginLocation)
- {
- this.loginLocation = loginLocation;
- }
-
- public String getBrowser()
- {
- return browser;
- }
-
- public void setBrowser(String browser)
- {
- this.browser = browser;
- }
-
- public String getOs()
- {
- return os;
- }
-
- public void setOs(String os)
- {
- this.os = os;
- }
-
- public String getMsg()
- {
- return msg;
- }
-
- public void setMsg(String msg)
- {
- this.msg = msg;
- }
-
- public Date getLoginTime()
- {
- return loginTime;
- }
-
- public void setLoginTime(Date loginTime)
- {
- this.loginTime = loginTime;
- }
}
--
Gitblit v1.9.3