From cf67d606ae9a4649a49b291090a3e3448acf8c0b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 17 三月 2022 19:52:40 +0800
Subject: [PATCH] update 初步适配 postgres (代码生成两次导入有问题)

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java |   63 +++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 21 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 82219a7..de095ec 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,83 +1,104 @@
 package com.ruoyi.system.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+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.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import lombok.*;
-import lombok.experimental.Accessors;
+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;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 绯荤粺璁块棶璁板綍琛� sys_logininfor
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
-@Accessors(chain = true)
 @TableName("sys_logininfor")
-public class SysLogininfor {
+@ExcelIgnoreUnannotated
+@ApiModel("绯荤粺璁块棶璁板綍涓氬姟瀵硅薄")
+public class SysLogininfor implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * ID
      */
-    @Excel(name = "搴忓彿", cellType = ColumnType.NUMERIC)
-    @TableId(value = "info_id", type = IdType.AUTO)
+    @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=澶辫触")
+    @ApiModelProperty(value = "鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触")
+    @ExcelProperty(value = "鐧诲綍鐘舵��", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_common_status")
     private String status;
 
     /**
      * 鐧诲綍IP鍦板潃
      */
-    @Excel(name = "鐧诲綍鍦板潃")
+    @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;
 
+    /**
+     * 璇锋眰鍙傛暟
+     */
+    @ApiModelProperty(value = "璇锋眰鍙傛暟")
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
 }

--
Gitblit v1.9.3