From 72e7d01b5b249ae1a079d19cdc62ecd2782c325c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sat, 10 Jun 2023 01:24:36 +0800
Subject: [PATCH] ecel
---
src/main/java/cc/mrbird/febs/monitor/entity/LoginLog.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/monitor/entity/LoginLog.java b/src/main/java/cc/mrbird/febs/monitor/entity/LoginLog.java
index f4cfd9d..b0820b8 100644
--- a/src/main/java/cc/mrbird/febs/monitor/entity/LoginLog.java
+++ b/src/main/java/cc/mrbird/febs/monitor/entity/LoginLog.java
@@ -1,13 +1,12 @@
package cc.mrbird.febs.monitor.entity;
-import cc.mrbird.febs.common.converter.TimeConverter;
+
import cc.mrbird.febs.common.utils.HttpContextUtil;
+import com.alibaba.excel.annotation.ExcelProperty;
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.wuwenze.poi.annotation.Excel;
-import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -22,7 +21,6 @@
@Slf4j
@Data
@TableName("t_login_log")
-@Excel("登录日志")
public class LoginLog implements Serializable {
private static final long serialVersionUID = 921991157363932095L;
@@ -36,39 +34,39 @@
* 登录用户
*/
@TableField("USERNAME")
- @ExcelField("登录用户")
+ @ExcelProperty("登录用户")
private String username;
/**
* 登录时间
*/
@TableField("LOGIN_TIME")
- @ExcelField(value = "登录时间", writeConverter = TimeConverter.class)
+ @ExcelProperty(value = "登录时间")
private Date loginTime;
/**
* 登录地点
*/
@TableField("LOCATION")
- @ExcelField(value = "登录地点")
+ @ExcelProperty(value = "登录地点")
private String location;
/**
* 登录 IP
*/
@TableField("IP")
- @ExcelField("登录IP")
+ @ExcelProperty("登录IP")
private String ip;
/**
* 操作系统
*/
@TableField("`SYSTEM`")
- @ExcelField("操作系统")
+ @ExcelProperty("操作系统")
private String system;
/**
* 登录浏览器
*/
@TableField("BROWSER")
- @ExcelField("登录浏览器")
+ @ExcelProperty("登录浏览器")
private String browser;
private transient String loginTimeFrom;
--
Gitblit v1.9.1