From 0b077806196ceb8a68af93f00880ccc70aee50c2 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 07 七月 2022 18:08:14 +0800 Subject: [PATCH] add 整合 springdoc 移除 knife4j --- ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 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 898aa8a..d878006 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 @@ -2,15 +2,13 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; 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.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; @@ -20,76 +18,85 @@ /** * 绯荤粺璁块棶璁板綍琛� sys_logininfor * - * @author ruoyi + * @author Lion Li */ @Data -@NoArgsConstructor -@Accessors(chain = true) @TableName("sys_logininfor") @ExcelIgnoreUnannotated +@Schema(name = "绯荤粺璁块棶璁板綍涓氬姟瀵硅薄") public class SysLogininfor implements Serializable { private static final long serialVersionUID = 1L; /** * ID */ + @Schema(name = "璁块棶ID") @ExcelProperty(value = "搴忓彿") - @TableId(value = "info_id", type = IdType.AUTO) + @TableId(value = "info_id") private Long infoId; /** * 鐢ㄦ埛璐﹀彿 */ + @Schema(name = "鐢ㄦ埛璐﹀彿") @ExcelProperty(value = "鐢ㄦ埛璐﹀彿") private String userName; /** * 鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触 */ + @Schema(name = "鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触") @ExcelProperty(value = "鐧诲綍鐘舵��", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") + @ExcelDictFormat(dictType = "sys_common_status") private String status; /** * 鐧诲綍IP鍦板潃 */ + @Schema(name = "鐧诲綍IP鍦板潃") @ExcelProperty(value = "鐧诲綍鍦板潃") private String ipaddr; /** * 鐧诲綍鍦扮偣 */ + @Schema(name = "鐧诲綍鍦扮偣") @ExcelProperty(value = "鐧诲綍鍦扮偣") private String loginLocation; /** * 娴忚鍣ㄧ被鍨� */ + @Schema(name = "娴忚鍣ㄧ被鍨�") @ExcelProperty(value = "娴忚鍣�") private String browser; /** * 鎿嶄綔绯荤粺 */ + @Schema(name = "鎿嶄綔绯荤粺") @ExcelProperty(value = "鎿嶄綔绯荤粺") private String os; /** * 鎻愮ず娑堟伅 */ + @Schema(name = "鎻愮ず娑堟伅") @ExcelProperty(value = "鎻愮ず娑堟伅") private String msg; /** * 璁块棶鏃堕棿 */ + @Schema(name = "璁块棶鏃堕棿") @ExcelProperty(value = "璁块棶鏃堕棿") private Date loginTime; /** * 璇锋眰鍙傛暟 */ + @Schema(name = "璇锋眰鍙傛暟") @TableField(exist = false) private Map<String, Object> params = new HashMap<>(); -- Gitblit v1.9.3