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/SysOperLog.java | 49 +++++++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index 84ab555..ebb3a4b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -7,10 +7,8 @@ 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 io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; @@ -24,10 +22,9 @@ */ @Data -@Accessors(chain = true) @TableName("sys_oper_log") @ExcelIgnoreUnannotated -@ApiModel("鎿嶄綔鏃ュ織璁板綍涓氬姟瀵硅薄") +@Schema(name = "鎿嶄綔鏃ュ織璁板綍涓氬姟瀵硅薄") public class SysOperLog implements Serializable { private static final long serialVersionUID = 1L; @@ -35,7 +32,7 @@ /** * 鏃ュ織涓婚敭 */ - @ApiModelProperty(value = "鏃ュ織涓婚敭") + @Schema(name = "鏃ュ織涓婚敭") @ExcelProperty(value = "鏃ュ織涓婚敭") @TableId(value = "oper_id") private Long operId; @@ -43,122 +40,122 @@ /** * 鎿嶄綔妯″潡 */ - @ApiModelProperty(value = "鎿嶄綔妯″潡") + @Schema(name = "鎿嶄綔妯″潡") @ExcelProperty(value = "鎿嶄綔妯″潡") private String title; /** * 涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛� */ - @ApiModelProperty(value = "涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛�") + @Schema(name = "涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛�") @ExcelProperty(value = "涓氬姟绫诲瀷", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_oper_type") + @ExcelDictFormat(dictType = "sys_oper_type") private Integer businessType; /** * 涓氬姟绫诲瀷鏁扮粍 */ - @ApiModelProperty(value = "涓氬姟绫诲瀷鏁扮粍") + @Schema(name = "涓氬姟绫诲瀷鏁扮粍") @TableField(exist = false) private Integer[] businessTypes; /** * 璇锋眰鏂规硶 */ - @ApiModelProperty(value = "璇锋眰鏂规硶") + @Schema(name = "璇锋眰鏂规硶") @ExcelProperty(value = "璇锋眰鏂规硶") private String method; /** * 璇锋眰鏂瑰紡 */ - @ApiModelProperty(value = "璇锋眰鏂瑰紡") + @Schema(name = "璇锋眰鏂瑰紡") @ExcelProperty(value = "璇锋眰鏂瑰紡") private String requestMethod; /** * 鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級 */ - @ApiModelProperty(value = "鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級") + @Schema(name = "鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級") @ExcelProperty(value = "鎿嶄綔绫诲埆", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�") + @ExcelDictFormat(readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�") private Integer operatorType; /** * 鎿嶄綔浜哄憳 */ - @ApiModelProperty(value = "鎿嶄綔浜哄憳") + @Schema(name = "鎿嶄綔浜哄憳") @ExcelProperty(value = "鎿嶄綔浜哄憳") private String operName; /** * 閮ㄩ棬鍚嶇О */ - @ApiModelProperty(value = "閮ㄩ棬鍚嶇О") + @Schema(name = "閮ㄩ棬鍚嶇О") @ExcelProperty(value = "閮ㄩ棬鍚嶇О") private String deptName; /** * 璇锋眰url */ - @ApiModelProperty(value = "璇锋眰url") + @Schema(name = "璇锋眰url") @ExcelProperty(value = "璇锋眰鍦板潃") private String operUrl; /** * 鎿嶄綔鍦板潃 */ - @ApiModelProperty(value = "鎿嶄綔鍦板潃") + @Schema(name = "鎿嶄綔鍦板潃") @ExcelProperty(value = "鎿嶄綔鍦板潃") private String operIp; /** * 鎿嶄綔鍦扮偣 */ - @ApiModelProperty(value = "鎿嶄綔鍦扮偣") + @Schema(name = "鎿嶄綔鍦扮偣") @ExcelProperty(value = "鎿嶄綔鍦扮偣") private String operLocation; /** * 璇锋眰鍙傛暟 */ - @ApiModelProperty(value = "璇锋眰鍙傛暟") + @Schema(name = "璇锋眰鍙傛暟") @ExcelProperty(value = "璇锋眰鍙傛暟") private String operParam; /** * 杩斿洖鍙傛暟 */ - @ApiModelProperty(value = "杩斿洖鍙傛暟") + @Schema(name = "杩斿洖鍙傛暟") @ExcelProperty(value = "杩斿洖鍙傛暟") private String jsonResult; /** * 鎿嶄綔鐘舵�侊紙0姝e父 1寮傚父锛� */ - @ApiModelProperty(value = "鎿嶄綔鐘舵�侊紙0姝e父 1寮傚父锛�") + @Schema(name = "鎿嶄綔鐘舵�侊紙0姝e父 1寮傚父锛�") @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") + @ExcelDictFormat(dictType = "sys_common_status") private Integer status; /** * 閿欒娑堟伅 */ - @ApiModelProperty(value = "閿欒娑堟伅") + @Schema(name = "閿欒娑堟伅") @ExcelProperty(value = "閿欒娑堟伅") private String errorMsg; /** * 鎿嶄綔鏃堕棿 */ - @ApiModelProperty(value = "鎿嶄綔鏃堕棿") + @Schema(name = "鎿嶄綔鏃堕棿") @ExcelProperty(value = "鎿嶄綔鏃堕棿") private Date operTime; /** * 璇锋眰鍙傛暟 */ - @ApiModelProperty(value = "璇锋眰鍙傛暟") + @Schema(name = "璇锋眰鍙傛暟") @TableField(exist = false) private Map<String, Object> params = new HashMap<>(); -- Gitblit v1.9.3