add 整合 springdoc 移除 knife4j

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java

@@ -3,8 +3,7 @@ package com.ruoyi.demo.domain.bo;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -20,48 +19,48 @@ import javax.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("测试单表业务对象")
+@Schema(name = "测试单表业务对象")
 public class TestDemoBo extends BaseEntity {
 
     /**
      * 主键
      */
-    @ApiModelProperty("主键")
+    @Schema(name = "主键")
     @NotNull(message = "主键不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
      * 部门id
      */
-    @ApiModelProperty("部门id")
+    @Schema(name = "部门id")
     @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long deptId;
 
     /**
      * 用户id
      */
-    @ApiModelProperty("用户id")
+    @Schema(name = "用户id")
     @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long userId;
 
     /**
      * 排序号
      */
-    @ApiModelProperty("排序号")
+    @Schema(name = "排序号")
     @NotNull(message = "排序号不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer orderNum;
 
     /**
      * key键
      */
-    @ApiModelProperty("key键")
+    @Schema(name = "key键")
     @NotBlank(message = "key键不能为空", groups = {AddGroup.class, EditGroup.class})
     private String testKey;
 
     /**
      * 值
      */
-    @ApiModelProperty("值")
+    @Schema(name = "值")
     @NotBlank(message = "值不能为空", groups = {AddGroup.class, EditGroup.class})
     private String value;
 

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java

@@ -1,8 +1,7 @@
 package com.ruoyi.demo.domain.bo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -15,13 +14,13 @@ import javax.validation.constraints.NotNull;
  * @date 2021-07-26
  */
 @Data
-@ApiModel("测试单表业务对象")
+@Schema(name = "测试单表业务对象")
 public class TestDemoImportVo {
 
     /**
      * 部门id
      */
-    @ApiModelProperty("部门id")
+    @Schema(name = "部门id")
     @NotNull(message = "部门id不能为空")
     @ExcelProperty(value = "部门id")
     private Long deptId;
@@ -29,7 +28,7 @@ public class TestDemoImportVo {
     /**
      * 用户id
      */
-    @ApiModelProperty("用户id")
+    @Schema(name = "用户id")
     @NotNull(message = "用户id不能为空")
     @ExcelProperty(value = "用户id")
     private Long userId;
@@ -37,7 +36,7 @@ public class TestDemoImportVo {
     /**
      * 排序号
      */
-    @ApiModelProperty("排序号")
+    @Schema(name = "排序号")
     @NotNull(message = "排序号不能为空")
     @ExcelProperty(value = "排序号")
     private Long orderNum;
@@ -45,7 +44,7 @@ public class TestDemoImportVo {
     /**
      * key键
      */
-    @ApiModelProperty("key键")
+    @Schema(name = "key键")
     @NotBlank(message = "key键不能为空")
     @ExcelProperty(value = "key键")
     private String testKey;
@@ -53,7 +52,7 @@ public class TestDemoImportVo {
     /**
      * 值
      */
-    @ApiModelProperty("值")
+    @Schema(name = "值")
     @NotBlank(message = "值不能为空")
     @ExcelProperty(value = "值")
     private String value;

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java

@@ -3,8 +3,7 @@ package com.ruoyi.demo.domain.bo;
 import com.ruoyi.common.core.domain.TreeEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -20,34 +19,34 @@ import javax.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("测试树表业务对象")
+@Schema(name = "测试树表业务对象")
 public class TestTreeBo extends TreeEntity<TestTreeBo> {
 
     /**
      * 主键
      */
-    @ApiModelProperty("主键")
+    @Schema(name = "主键")
     @NotNull(message = "主键不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
      * 部门id
      */
-    @ApiModelProperty("部门id")
+    @Schema(name = "部门id")
     @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long deptId;
 
     /**
      * 用户id
      */
-    @ApiModelProperty("用户id")
+    @Schema(name = "用户id")
     @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long userId;
 
     /**
      * 树节点名
      */
-    @ApiModelProperty("树节点名")
+    @Schema(name = "树节点名")
     @NotBlank(message = "树节点名不能为空", groups = {AddGroup.class, EditGroup.class})
     private String treeName;
 

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java

@@ -2,8 +2,7 @@ package com.ruoyi.demo.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,7 +15,7 @@ import java.util.Date;
  * @date 2021-07-26
  */
 @Data
-@ApiModel("测试单表视图对象")
+@Schema(name = "测试单表视图对象")
 @ExcelIgnoreUnannotated
 public class TestDemoVo {
 
@@ -26,70 +25,70 @@ public class TestDemoVo {
      * 主键
      */
     @ExcelProperty(value = "主键")
-    @ApiModelProperty("主键")
+    @Schema(name = "主键")
     private Long id;
 
     /**
      * 部门id
      */
     @ExcelProperty(value = "部门id")
-    @ApiModelProperty("部门id")
+    @Schema(name = "部门id")
     private Long deptId;
 
     /**
      * 用户id
      */
     @ExcelProperty(value = "用户id")
-    @ApiModelProperty("用户id")
+    @Schema(name = "用户id")
     private Long userId;
 
     /**
      * 排序号
      */
     @ExcelProperty(value = "排序号")
-    @ApiModelProperty("排序号")
+    @Schema(name = "排序号")
     private Integer orderNum;
 
     /**
      * key键
      */
     @ExcelProperty(value = "key键")
-    @ApiModelProperty("key键")
+    @Schema(name = "key键")
     private String testKey;
 
     /**
      * 值
      */
     @ExcelProperty(value = "值")
-    @ApiModelProperty("值")
+    @Schema(name = "值")
     private String value;
 
     /**
      * 创建时间
      */
     @ExcelProperty(value = "创建时间")
-    @ApiModelProperty("创建时间")
+    @Schema(name = "创建时间")
     private Date createTime;
 
     /**
      * 创建人
      */
     @ExcelProperty(value = "创建人")
-    @ApiModelProperty("创建人")
+    @Schema(name = "创建人")
     private String createBy;
 
     /**
      * 更新时间
      */
     @ExcelProperty(value = "更新时间")
-    @ApiModelProperty("更新时间")
+    @Schema(name = "更新时间")
     private Date updateTime;
 
     /**
      * 更新人
      */
     @ExcelProperty(value = "更新人")
-    @ApiModelProperty("更新人")
+    @Schema(name = "更新人")
     private String updateBy;
 
 

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java

@@ -2,8 +2,7 @@ package com.ruoyi.demo.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,7 +15,7 @@ import java.util.Date;
  * @date 2021-07-26
  */
 @Data
-@ApiModel("测试树表视图对象")
+@Schema(name = "测试树表视图对象")
 @ExcelIgnoreUnannotated
 public class TestTreeVo {
 
@@ -25,42 +24,42 @@ public class TestTreeVo {
     /**
      * 主键
      */
-    @ApiModelProperty("主键")
+    @Schema(name = "主键")
     private Long id;
 
     /**
      * 父id
      */
     @ExcelProperty(value = "父id")
-    @ApiModelProperty("父id")
+    @Schema(name = "父id")
     private Long parentId;
 
     /**
      * 部门id
      */
     @ExcelProperty(value = "部门id")
-    @ApiModelProperty("部门id")
+    @Schema(name = "部门id")
     private Long deptId;
 
     /**
      * 用户id
      */
     @ExcelProperty(value = "用户id")
-    @ApiModelProperty("用户id")
+    @Schema(name = "用户id")
     private Long userId;
 
     /**
      * 树节点名
      */
     @ExcelProperty(value = "树节点名")
-    @ApiModelProperty("树节点名")
+    @Schema(name = "树节点名")
     private String treeName;
 
     /**
      * 创建时间
      */
     @ExcelProperty(value = "创建时间")
-    @ApiModelProperty("创建时间")
+    @Schema(name = "创建时间")
     private Date createTime;