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/SysPost.java | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index b0b8a11..f479a88 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -8,13 +8,12 @@ import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; /** @@ -25,16 +24,15 @@ @Data @EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) @TableName("sys_post") @ExcelIgnoreUnannotated -@ApiModel("宀椾綅淇℃伅涓氬姟瀵硅薄") +@Schema(name = "宀椾綅淇℃伅涓氬姟瀵硅薄") public class SysPost extends BaseEntity { /** * 宀椾綅搴忓彿 */ - @ApiModelProperty(value = "宀椾綅搴忓彿") + @Schema(name = "宀椾綅搴忓彿") @ExcelProperty(value = "宀椾綅搴忓彿") @TableId(value = "post_id") private Long postId; @@ -42,7 +40,7 @@ /** * 宀椾綅缂栫爜 */ - @ApiModelProperty(value = "宀椾綅缂栫爜") + @Schema(name = "宀椾綅缂栫爜") @ExcelProperty(value = "宀椾綅缂栫爜") @NotBlank(message = "宀椾綅缂栫爜涓嶈兘涓虹┖") @Size(min = 0, max = 64, message = "宀椾綅缂栫爜闀垮害涓嶈兘瓒呰繃64涓瓧绗�") @@ -51,7 +49,7 @@ /** * 宀椾綅鍚嶇О */ - @ApiModelProperty(value = "宀椾綅鍚嶇О") + @Schema(name = "宀椾綅鍚嶇О") @ExcelProperty(value = "宀椾綅鍚嶇О") @NotBlank(message = "宀椾綅鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 50, message = "宀椾綅鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�") @@ -60,29 +58,29 @@ /** * 宀椾綅鎺掑簭 */ - @ApiModelProperty(value = "宀椾綅鎺掑簭") + @Schema(name = "宀椾綅鎺掑簭") @ExcelProperty(value = "宀椾綅鎺掑簭") - @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - private String postSort; + @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") + private Integer postSort; /** * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ - @ApiModelProperty(value = "鐘舵�侊紙0姝e父 1鍋滅敤锛�") - @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") + @Schema(name = "鐘舵�侊紙0姝e父 1鍋滅敤锛�") + @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_common_status") private String status; /** * 澶囨敞 */ - @ApiModelProperty(value = "澶囨敞") + @Schema(name = "澶囨敞") private String remark; /** * 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦� */ - @ApiModelProperty(value = "鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦�") + @Schema(name = "鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦�") @TableField(exist = false) private boolean flag = false; -- Gitblit v1.9.3