From c3b925cc139d6a325309882d309e8b55144b6722 Mon Sep 17 00:00:00 2001 From: lsym004933 Date: Sat, 17 Jan 2026 13:54:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(codegen):=20=E6=9B=B4=E6=96=B0Swagger?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/fateverse/admin/dto/ConfigDto.java | 14 +++--- .../cn/fateverse/admin/dto/DictDataDto.java | 18 ++++---- .../cn/fateverse/admin/dto/DictTypeDto.java | 10 ++-- .../cn/fateverse/admin/dto/IpBackDto.java | 6 +-- .../java/cn/fateverse/admin/dto/MenuDto.java | 34 +++++++------- .../java/cn/fateverse/admin/dto/PostDto.java | 12 ++--- .../java/cn/fateverse/admin/dto/RoleDto.java | 18 ++++---- .../java/cn/fateverse/admin/dto/UserDto.java | 6 +-- .../cn/fateverse/admin/entity/DictType.java | 10 ++-- .../cn/fateverse/admin/entity/OnlineUser.java | 18 ++++---- .../cn/fateverse/admin/query/ConfigQuery.java | 8 ++-- .../fateverse/admin/query/DictDataQuery.java | 8 ++-- .../fateverse/admin/query/DictTypeQuery.java | 8 ++-- .../admin/query/MappingSwitchQuery.java | 8 ++-- .../cn/fateverse/admin/query/PostQuery.java | 8 ++-- .../cn/fateverse/admin/query/RoleQuery.java | 8 ++-- .../cn/fateverse/admin/query/UserQuery.java | 10 ++-- .../java/cn/fateverse/admin/vo/ConfigVo.java | 14 +++--- .../cn/fateverse/admin/vo/DictDataSimpVo.java | 14 +++--- .../cn/fateverse/admin/vo/DictDataVo.java | 18 ++++---- .../cn/fateverse/admin/vo/DictTypeVo.java | 12 ++--- .../java/cn/fateverse/admin/vo/IpBackVo.java | 10 ++-- .../cn/fateverse/admin/vo/MenuSimpVo.java | 18 ++++---- .../java/cn/fateverse/admin/vo/MenuVo.java | 34 +++++++------- .../cn/fateverse/admin/vo/OptionMenuVo.java | 6 +-- .../java/cn/fateverse/admin/vo/PostVo.java | 12 ++--- .../java/cn/fateverse/admin/vo/RoleVo.java | 18 ++++---- .../cn/fateverse/admin/vo/UserDetailVo.java | 12 ++--- .../java/cn/fateverse/admin/vo/UserVo.java | 16 +++---- admin/admin-biz/pom.xml | 2 +- .../admin/entity/dto/MappingSwitchDto.java | 6 +-- .../admin/entity/vo/MappingSwitchVo.java | 24 +++++----- .../service/impl/DictDataServiceImpl.java | 2 +- .../cn/fateverse/auth/entity/LoginBody.java | 10 ++-- .../cn/fateverse/code/entity/ApiClass.java | 18 ++++---- .../cn/fateverse/code/entity/InterTable.java | 22 ++++----- .../java/cn/fateverse/code/entity/Module.java | 8 ++-- .../cn/fateverse/code/entity/RelTable.java | 28 +++++------ .../fateverse/code/entity/RelTableColumn.java | 28 +++++------ .../java/cn/fateverse/code/entity/Table.java | 38 +++++++-------- .../cn/fateverse/code/entity/TableColumn.java | 46 +++++++++---------- .../code/entity/dto/DataSourceDto.java | 22 ++++----- .../fateverse/code/entity/dto/RegularDto.java | 12 ++--- .../code/entity/query/DataSourceQuery.java | 4 +- .../code/entity/query/DynamicTable.java | 6 +-- .../code/entity/query/RegularQuery.java | 8 ++-- .../code/entity/query/TableQuery.java | 10 ++-- .../code/entity/vo/DataSourceVo.java | 22 ++++----- .../fateverse/code/entity/vo/RegularVo.java | 12 ++--- .../cn/fateverse/code/entity/vo/TableVo.java | 12 ++--- .../main/resources/vm/java/entityDto.java.vm | 6 +-- .../resources/vm/java/entityQuery.java.vm | 8 ++-- .../main/resources/vm/java/entityVo.java.vm | 6 +-- .../fateverse/query/entity/DynamicTable.java | 6 +-- .../query/entity/dto/DataAdapterDto.java | 12 ++--- .../query/entity/dto/DataSourceManageDto.java | 26 +++++------ .../query/entity/dto/DynamicEchartsDto.java | 12 ++--- .../fateverse/query/entity/dto/PortalDto.java | 32 ++++++------- .../fateverse/query/entity/dto/TableDto.java | 12 ++--- .../query/entity/dto/UniQueryDto.java | 20 ++++---- .../query/entity/query/DataAdapterQuery.java | 6 +-- .../entity/query/DataSourceManageQuery.java | 8 ++-- .../entity/query/DynamicEchartsQuery.java | 6 +-- .../query/entity/query/DynamicTableQuery.java | 6 +-- .../query/entity/query/PortalQuery.java | 10 ++-- .../query/entity/query/TableQuery.java | 10 ++-- .../query/entity/query/UniQueryQuery.java | 12 ++--- .../query/entity/vo/DataAdapterVo.java | 12 ++--- .../query/entity/vo/DataSourceManageVo.java | 16 +++---- .../query/entity/vo/DynamicEchartsVo.java | 14 +++--- .../query/entity/vo/SimplePortalVo.java | 30 ++++++------ .../fateverse/query/entity/vo/SqlInfoVo.java | 6 +-- .../cn/fateverse/query/entity/vo/TableVo.java | 14 +++--- .../fateverse/query/entity/vo/UniQueryVo.java | 18 ++++---- .../cn/fateverse/notice/dto/NoticeDto.java | 18 ++++---- .../notice/entity/query/NoticeQuery.java | 14 +++--- .../fateverse/notice/entity/vo/NoticeVo.java | 24 +++++----- .../fateverse/notice/entity/vo/NotifyVo.java | 10 ++-- .../entity/dto/ProcessListenerDto.java | 14 +++--- .../entity/query/ProcessListenerQuery.java | 10 ++-- .../workflow/entity/query/ProcessQuery.java | 6 +-- .../workflow/entity/vo/ProcessListenerVo.java | 14 +++--- 82 files changed, 573 insertions(+), 573 deletions(-) diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/ConfigDto.java b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/ConfigDto.java index 2f1b254..0d7891a 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/ConfigDto.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/ConfigDto.java @@ -2,7 +2,7 @@ package cn.fateverse.admin.dto; import cn.fateverse.admin.entity.Config; 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.NotNull; @@ -20,41 +20,41 @@ public class ConfigDto { /** * 参数主键 */ - @ApiModelProperty("参数主键") + @Schema(description = "参数主键") private Integer configId; /** * 参数名称 */ @NotNull(message = "参数名称不能为空!") - @ApiModelProperty("参数名称") + @Schema(description = "参数名称") private String configName; /** * 参数键名 */ @NotNull(message = "参数键名不能为空!") - @ApiModelProperty("参数键名") + @Schema(description = "参数键名") private String configKey; /** * 参数键值 */ @NotNull(message = "参数键值不能为空!") - @ApiModelProperty("参数键值") + @Schema(description = "参数键值") private String configValue; /** * 系统内置(1是 0否) */ @NotNull(message = "是否系统内置不能为空!") - @ApiModelProperty("系统内置(1是 0否)") + @Schema(description = "系统内置(1是 0否)") private Integer configType; /** * 备注 */ - @ApiModelProperty("备注") + @Schema(description = "备注") private String remark; public Config toConfig() { diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictDataDto.java b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictDataDto.java index 6121316..55fc3cb 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictDataDto.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictDataDto.java @@ -1,7 +1,7 @@ package cn.fateverse.admin.dto; 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.NotNull; @@ -20,46 +20,46 @@ public class DictDataDto { /** * 字典排序 */ - @ApiModelProperty("字典排序") + @Schema(description = "字典排序") @NotNull(message = "状态不能为空!") private Integer dictSort; /** * 字典标签 */ - @ApiModelProperty("字典标签") + @Schema(description = "字典标签") @NotNull(message = "字典标签不能为空!") private String dictLabel; /** * 字典键值 */ - @ApiModelProperty("字典键值") + @Schema(description = "字典键值") @NotNull(message = "字典键值不能为空!") private String dictValue; /** * 字典类型 */ - @ApiModelProperty("字典类型") + @Schema(description = "字典类型") @NotNull(message = "字典类型不能为空!") private String dictType; /** * 样式属性(其他样式扩展) */ - @ApiModelProperty("样式属性(其他样式扩展)") + @Schema(description = "样式属性(其他样式扩展)") private Boolean isType; /** * 表格回显样式 */ - @ApiModelProperty("表格回显样式") + @Schema(description = "表格回显样式") private String listClass; /** * 字典显示主题(ui框架时)or文字颜色(自定义颜色时) */ - @ApiModelProperty("字典显示主题(ui框架时)or文字颜色(自定义颜色时)") + @Schema(description = "字典显示主题(ui框架时)or文字颜色(自定义颜色时)") private String theme; /** * 是否默认(Y是 N否) */ - @ApiModelProperty("是否默认(Y是 N否)") + @Schema(description = "是否默认(Y是 N否)") private Integer isDefault; /** * 状态(1正常 0停用) diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictTypeDto.java b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictTypeDto.java index ed01f09..a163405 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictTypeDto.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/DictTypeDto.java @@ -1,7 +1,7 @@ package cn.fateverse.admin.dto; 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.NotNull; @@ -17,24 +17,24 @@ public class DictTypeDto { /** * 字典主键 */ - @ApiModelProperty("字典主键") + @Schema(description = "字典主键") private Long dictId; /** * 字典名称 */ - @ApiModelProperty("字典名称") + @Schema(description = "字典名称") @NotNull(message = "字典名称不能为空!") private String dictName; /** * 字典类型 */ - @ApiModelProperty("字典类型") + @Schema(description = "字典类型") @NotNull(message = "字典类型不能为空!") private String dictType; /** * 字典状态(1正常 0停用) */ - @ApiModelProperty("字典状态") + @Schema(description = "字典状态") @NotNull(message = "字典状态不能为空!") private String state; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/IpBackDto.java b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/IpBackDto.java index 56f7cb6..cb5aca0 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/IpBackDto.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/IpBackDto.java @@ -1,6 +1,6 @@ package cn.fateverse.admin.dto; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -14,13 +14,13 @@ public class IpBackDto { /** * 主键id */ - @ApiModelProperty("主键id") + @Schema(description = "主键id") private Long id; /** * ip地址 */ @NotBlank(message = "ip地址不能为空") - @ApiModelProperty("ip地址") + @Schema(description = "ip地址") private String ipAddr; } diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/MenuDto.java b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/MenuDto.java index 48fd9a8..22df9c1 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/MenuDto.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/MenuDto.java @@ -1,7 +1,7 @@ package cn.fateverse.admin.dto; 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; @@ -21,7 +21,7 @@ public class MenuDto implements Serializable { /** * 菜单ID */ - @ApiModelProperty("菜单ID") + @Schema(description = "菜单ID") private Long menuId; /** @@ -29,86 +29,86 @@ public class MenuDto implements Serializable { */ @NotBlank(message = "菜单名称不能为空") @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") - @ApiModelProperty("菜单名称") + @Schema(description = "菜单名称") private String menuName; /** * 父菜单ID */ - @ApiModelProperty("父菜单ID") + @Schema(description = "父菜单ID") private Long parentId; /** * 显示顺序 */ - @ApiModelProperty("显示顺序") + @Schema(description = "显示顺序") @NotNull(message = "显示顺序不能为空") private Integer orderNum; /** * 路由地址 */ - @ApiModelProperty("路由地址") + @Schema(description = "路由地址") @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") private String path; - @ApiModelProperty("路径参数") + @Schema(description = "路径参数") private String pathParams; /** * 组件路径 */ - @ApiModelProperty("组件路径") + @Schema(description = "组件路径") @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") private String component; /** * 是否为外链(0是 1否) */ - @ApiModelProperty("是否为外链(0是 1否)") + @Schema(description = "是否为外链(0是 1否)") private Boolean isFrame; /** * 是否缓存(0缓存 1不缓存) */ - @ApiModelProperty("是否缓存(0缓存 1不缓存)") + @Schema(description = "是否缓存(0缓存 1不缓存)") private Boolean isCache; - @ApiModelProperty("不重定向") + @Schema(description = "不重定向") private Boolean noRedirect; - @ApiModelProperty("面包屑") + @Schema(description = "面包屑") private Boolean breadcrumb; /** * 类型(D目录 M菜单 B按钮) */ - @ApiModelProperty("类型(D目录 M菜单 B按钮)") + @Schema(description = "类型(D目录 M菜单 B按钮)") @NotBlank(message = "菜单类型不能为空") private String menuType; /** * 显示状态(0显示 1隐藏) */ - @ApiModelProperty("显示状态(0显示 1隐藏)") + @Schema(description = "显示状态(0显示 1隐藏)") private String visible; /** * 菜单状态(0显示 1隐藏) */ - @ApiModelProperty("菜单状态(0显示 1隐藏)") + @Schema(description = "菜单状态(0显示 1隐藏)") private String state; /** * 权限字符串 */ - @ApiModelProperty("权限字符串") + @Schema(description = "权限字符串") @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") private String perms; /** * 菜单图标 */ - @ApiModelProperty("菜单图标") + @Schema(description = "菜单图标") private String icon; } diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/PostDto.java b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/PostDto.java index abc2f7c..eb770d2 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/PostDto.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/PostDto.java @@ -1,7 +1,7 @@ package cn.fateverse.admin.dto; 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.NotNull; @@ -17,30 +17,30 @@ public class PostDto { /** * 岗位ID */ - @ApiModelProperty("岗位ID") + @Schema(description = "岗位ID") private Long postId; /** * 岗位编码 */ - @ApiModelProperty("岗位编码") + @Schema(description = "岗位编码") @NotNull(message = "岗位编码不能为空!") private String postCode; /** * 岗位名称 */ - @ApiModelProperty("岗位名称") + @Schema(description = "岗位名称") @NotNull(message = "岗位名称不能为空!") private String postName; /** * 显示顺序 */ - @ApiModelProperty("显示顺序") + @Schema(description = "显示顺序") @NotNull(message = "显示顺序不能为空!") private Integer postSort; /** * 状态(1正常 0停用) */ - @ApiModelProperty("状态(1正常 0停用)") + @Schema(description = "状态(1正常 0停用)") @NotNull(message = "状态不能为空!") private String state; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/RoleDto.java b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/RoleDto.java index 193f7b8..5fed254 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/RoleDto.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/RoleDto.java @@ -2,7 +2,7 @@ package cn.fateverse.admin.dto; import cn.fateverse.common.core.entity.Role; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -24,53 +24,53 @@ public class RoleDto { /** * 角色ID */ - @ApiModelProperty("角色id") + @Schema(description = "角色id") private Long roleId; /** * 角色名称 */ - @ApiModelProperty("角色名称") + @Schema(description = "角色名称") @NotBlank(message = "角色名称不能为空!") private String roleName; /** * 角色关键词 */ - @ApiModelProperty("角色关键词") + @Schema(description = "角色关键词") @NotBlank(message = "角色关键词不能为空!") private String roleKey; /** * 角色排序 */ - @ApiModelProperty("角色排序") + @Schema(description = "角色排序") @NotNull(message = "角色排序不能为空!") private Integer roleSort; /** * 数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限) */ - @ApiModelProperty("数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限)") + @Schema(description = "数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限)") private String dataScope; /** * 角色状态(1正常 0停用) */ - @ApiModelProperty("角色状态(1正常 0停用)") + @Schema(description = "角色状态(1正常 0停用)") @NotBlank(message = "角色状态不能为空!") private String state; /** * 菜单组 */ - @ApiModelProperty("菜单组") + @Schema(description = "菜单组") private Set menuIds; /** * 部门组(数据权限) */ - @ApiModelProperty("部门组(数据权限)") + @Schema(description = "部门组(数据权限)") private Long[] deptIds; public Role toRole() { diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/UserDto.java b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/UserDto.java index d007825..b119f6f 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/UserDto.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/dto/UserDto.java @@ -2,7 +2,7 @@ package cn.fateverse.admin.dto; import cn.fateverse.common.core.entity.UserBase; 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.Email; @@ -74,12 +74,12 @@ public class UserDto{ /** * 岗位ids */ - @ApiModelProperty("岗位ids") + @Schema(description = "岗位ids") private List postIds; /** * 角色ids */ - @ApiModelProperty("角色ids") + @Schema(description = "角色ids") private List roleIds; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/entity/DictType.java b/admin/admin-api/src/main/java/cn/fateverse/admin/entity/DictType.java index 53b31dd..66c507b 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/entity/DictType.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/entity/DictType.java @@ -3,7 +3,7 @@ package cn.fateverse.admin.entity; import cn.fateverse.common.core.annotaion.EnableAutoField; import cn.fateverse.common.core.entity.BaseEntity; 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.NotNull; @@ -20,24 +20,24 @@ public class DictType extends BaseEntity { /** * 字典主键 */ - @ApiModelProperty("字典主键") + @Schema(description = "字典主键") private Long dictId; /** * 字典名称 */ - @ApiModelProperty("字典名称") + @Schema(description = "字典名称") @NotNull(message = "字典名称不能为空!") private String dictName; /** * 字典类型 */ - @ApiModelProperty("字典类型") + @Schema(description = "字典类型") @NotNull(message = "字典类型不能为空!") private String dictType; /** * 字典状态(1正常 0停用) */ - @ApiModelProperty("字典状态") + @Schema(description = "字典状态") @NotNull(message = "字典状态不能为空!") private String state; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/entity/OnlineUser.java b/admin/admin-api/src/main/java/cn/fateverse/admin/entity/OnlineUser.java index ad52a76..09e7ddf 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/entity/OnlineUser.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/entity/OnlineUser.java @@ -1,7 +1,7 @@ package cn.fateverse.admin.entity; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; @@ -19,45 +19,45 @@ public class OnlineUser { /** * 会话id */ - @ApiModelProperty("会话id") + @Schema(description = "会话id") private String tokenId; /** * 用户名 */ - @ApiModelProperty("用户名") + @Schema(description = "用户名") private String username; /** * 部门名称 */ - @ApiModelProperty("部门名称") + @Schema(description = "部门名称") private String deptName; /** * 登录ip */ - @ApiModelProperty("登录ip") + @Schema(description = "登录ip") private String ipAddr; /** * 登录地点 */ - @ApiModelProperty("登录地点") + @Schema(description = "登录地点") private String loginLocation; /** * 浏览器类型 */ - @ApiModelProperty("浏览器类型") + @Schema(description = "浏览器类型") private String browser; /** * 操作系统 */ - @ApiModelProperty("操作系统") + @Schema(description = "操作系统") private String os; /** * 登录时间 */ - @ApiModelProperty("登录时间") + @Schema(description = "登录时间") private Date loginTime; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/query/ConfigQuery.java b/admin/admin-api/src/main/java/cn/fateverse/admin/query/ConfigQuery.java index 435bda3..a01b1b1 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/query/ConfigQuery.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/query/ConfigQuery.java @@ -1,7 +1,7 @@ package cn.fateverse.admin.query; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,18 +21,18 @@ public class ConfigQuery { /** * 参数名称 */ - @ApiModelProperty("参数名称") + @Schema(description = "参数名称") private String configName; /** * 参数键名 */ - @ApiModelProperty("参数键名") + @Schema(description = "参数键名") private String configKey; /** * 系统内置(1是 0否) */ - @ApiModelProperty("系统内置(1是 0否)") + @Schema(description = "系统内置(1是 0否)") private Integer configType; } \ No newline at end of file diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/query/DictDataQuery.java b/admin/admin-api/src/main/java/cn/fateverse/admin/query/DictDataQuery.java index 619d0d3..259cff9 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/query/DictDataQuery.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/query/DictDataQuery.java @@ -1,6 +1,6 @@ package cn.fateverse.admin.query; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -13,16 +13,16 @@ public class DictDataQuery { /** * 字典类型 */ - @ApiModelProperty(value = "字典名称",required = true) + @Schema(description = "字典名称",required = true) private String dictType; /** * 字典标签 */ - @ApiModelProperty("字典标签") + @Schema(description = "字典标签") private String dictLabel; /** * 状态(1正常 0停用) */ - @ApiModelProperty("帐号状态(1正常 0停用)") + @Schema(description = "帐号状态(1正常 0停用)") private String state; } diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/query/DictTypeQuery.java b/admin/admin-api/src/main/java/cn/fateverse/admin/query/DictTypeQuery.java index 47aa286..9c921a5 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/query/DictTypeQuery.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/query/DictTypeQuery.java @@ -1,7 +1,7 @@ package cn.fateverse.admin.query; import cn.fateverse.common.core.entity.QueryTime; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -14,18 +14,18 @@ public class DictTypeQuery extends QueryTime { /** * 字典名称 */ - @ApiModelProperty("字典名称") + @Schema(description = "字典名称") private String dictName; /** * 字典类型 */ - @ApiModelProperty("字典类型") + @Schema(description = "字典类型") private String dictType; /** * 帐号状态(1正常 0停用) */ - @ApiModelProperty("帐号状态(1正常 0停用)") + @Schema(description = "帐号状态(1正常 0停用)") private String state; } diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/query/MappingSwitchQuery.java b/admin/admin-api/src/main/java/cn/fateverse/admin/query/MappingSwitchQuery.java index 6b12c5e..c09414a 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/query/MappingSwitchQuery.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/query/MappingSwitchQuery.java @@ -1,7 +1,7 @@ package cn.fateverse.admin.query; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -12,12 +12,12 @@ import lombok.Data; @ApiModel("接口开关Query") public class MappingSwitchQuery { - @ApiModelProperty("应用名称") + @Schema(description = "应用名称") private String applicationName; - @ApiModelProperty("类别名称") + @Schema(description = "类别名称") private String className; - @ApiModelProperty("方法名称") + @Schema(description = "方法名称") private String methodName; } diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/query/PostQuery.java b/admin/admin-api/src/main/java/cn/fateverse/admin/query/PostQuery.java index 7795ca0..6122765 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/query/PostQuery.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/query/PostQuery.java @@ -1,6 +1,6 @@ package cn.fateverse.admin.query; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,18 +17,18 @@ public class PostQuery { /** * 岗位编码 */ - @ApiModelProperty("岗位编码") + @Schema(description = "岗位编码") private String postCode; /** * 岗位名称 */ - @ApiModelProperty("岗位名称") + @Schema(description = "岗位名称") private String postName; /** * 状态(1正常 0停用) */ - @ApiModelProperty("状态(1正常 0停用)") + @Schema(description = "状态(1正常 0停用)") private String state; } diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/query/RoleQuery.java b/admin/admin-api/src/main/java/cn/fateverse/admin/query/RoleQuery.java index 983363a..a22b527 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/query/RoleQuery.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/query/RoleQuery.java @@ -2,7 +2,7 @@ package cn.fateverse.admin.query; import cn.fateverse.common.core.entity.QueryTime; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -15,17 +15,17 @@ public class RoleQuery extends QueryTime { /** * 权限字符 */ - @ApiModelProperty("角色名称") + @Schema(description = "角色名称") private String roleName; /** * 权限字符 */ - @ApiModelProperty("权限字符") + @Schema(description = "权限字符") private String roleKey; /** * 帐号状态(1正常 0停用) */ - @ApiModelProperty("帐号状态(1正常 0停用)") + @Schema(description = "帐号状态(1正常 0停用)") private String state; } diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/query/UserQuery.java b/admin/admin-api/src/main/java/cn/fateverse/admin/query/UserQuery.java index 8717e40..d9ae426 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/query/UserQuery.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/query/UserQuery.java @@ -2,7 +2,7 @@ package cn.fateverse.admin.query; import cn.fateverse.common.core.entity.QueryTime; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -16,25 +16,25 @@ public class UserQuery extends QueryTime { /** * 部门ID */ - @ApiModelProperty("部门ID") + @Schema(description = "部门ID") private Long deptId; /** * 用户账号 */ - @ApiModelProperty("用户账号") + @Schema(description = "用户账号") private String userName; /** * 手机号码 */ - @ApiModelProperty("手机号码") + @Schema(description = "手机号码") private String phoneNumber; /** * 帐号状态(1正常 0停用) */ - @ApiModelProperty("帐号状态(1正常 0停用)") + @Schema(description = "帐号状态(1正常 0停用)") private String state; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/ConfigVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/ConfigVo.java index ec220f8..003a52e 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/ConfigVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/ConfigVo.java @@ -3,7 +3,7 @@ package cn.fateverse.admin.vo; import cn.fateverse.admin.entity.Config; import cn.fateverse.common.core.annotaion.Excel; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -25,41 +25,41 @@ public class ConfigVo { /** * 参数主键 */ - @ApiModelProperty("参数主键") + @Schema(description = "参数主键") private Integer configId; /** * 参数名称 */ - @ApiModelProperty("参数名称") + @Schema(description = "参数名称") @Excel("参数名称") private String configName; /** * 参数键名 */ - @ApiModelProperty("参数键名") + @Schema(description = "参数键名") @Excel("参数键名") private String configKey; /** * 参数键值 */ - @ApiModelProperty("参数键值") + @Schema(description = "参数键值") @Excel("参数键值") private String configValue; /** * 系统内置(1是 0否) */ - @ApiModelProperty("系统内置(1是 0否)") + @Schema(description = "系统内置(1是 0否)") @Excel("系统内置(1是 0否)") private Integer configType; /** * 备注 */ - @ApiModelProperty("备注") + @Schema(description = "备注") @Excel("备注") private String remark; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataSimpVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataSimpVo.java index 4013cbc..403bd90 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataSimpVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataSimpVo.java @@ -2,7 +2,7 @@ package cn.fateverse.admin.vo; import cn.fateverse.admin.entity.DictData; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -23,34 +23,34 @@ public class DictDataSimpVo { /** * 字典标签 */ - @ApiModelProperty("字典标签") + @Schema(description = "字典标签") @NotNull(message = "字典标签不能为空!") private String label; /** * 字典键值 */ - @ApiModelProperty("字典键值") + @Schema(description = "字典键值") @NotNull(message = "字典键值不能为空!") private String value; /** * 样式属性(其他样式扩展) */ - @ApiModelProperty("样式属性(其他样式扩展)") + @Schema(description = "样式属性(其他样式扩展)") private Boolean isType; /** * 表格回显样式 */ - @ApiModelProperty("表格回显样式") + @Schema(description = "表格回显样式") private String listClass; /** * 字典显示主题(ui框架时)or文字颜色(自定义颜色时) */ - @ApiModelProperty("字典显示主题(ui框架时)or文字颜色(自定义颜色时)") + @Schema(description = "字典显示主题(ui框架时)or文字颜色(自定义颜色时)") private String theme; /** * 是否默认(Y是 N否) */ - @ApiModelProperty("是否默认(Y是 N否)") + @Schema(description = "是否默认(Y是 N否)") private Integer isDefault; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataVo.java index 84ecee9..7c767db 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataVo.java @@ -1,6 +1,6 @@ package cn.fateverse.admin.vo; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -29,42 +29,42 @@ public class DictDataVo implements Serializable { /** * 字典排序 */ - @ApiModelProperty("字典排序") + @Schema(description = "字典排序") private Integer dictSort; /** * 字典标签 */ - @ApiModelProperty("字典标签") + @Schema(description = "字典标签") private String dictLabel; /** * 字典键值 */ - @ApiModelProperty("字典键值") + @Schema(description = "字典键值") private String dictValue; /** * 字典类型 */ - @ApiModelProperty("字典类型") + @Schema(description = "字典类型") private String dictType; /** * 样式属性(其他样式扩展) */ - @ApiModelProperty("样式属性(其他样式扩展)") + @Schema(description = "样式属性(其他样式扩展)") private Boolean isType; /** * 表格回显样式 */ - @ApiModelProperty("表格回显样式") + @Schema(description = "表格回显样式") private String listClass; /** * 字典显示主题(ui框架时)or文字颜色(自定义颜色时) */ - @ApiModelProperty("字典显示主题(ui框架时)or文字颜色(自定义颜色时)") + @Schema(description = "字典显示主题(ui框架时)or文字颜色(自定义颜色时)") private String theme; /** * 是否默认(Y是 N否) */ - @ApiModelProperty("是否默认(Y是 N否)") + @Schema(description = "是否默认(Y是 N否)") private Integer isDefault; /** * 状态(1正常 0停用) diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictTypeVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictTypeVo.java index 1b77eb0..d5e97a2 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictTypeVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictTypeVo.java @@ -2,7 +2,7 @@ package cn.fateverse.admin.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; @@ -19,29 +19,29 @@ public class DictTypeVo { /** * 字典id */ - @ApiModelProperty("字典id") + @Schema(description = "字典id") private Long dictId; /** * 字典名称 */ - @ApiModelProperty("字典名称") + @Schema(description = "字典名称") private String dictName; /** * 字典类型 */ - @ApiModelProperty("字典类型") + @Schema(description = "字典类型") private String dictType; /** * 帐号状态(1正常 0停用) */ - @ApiModelProperty("帐号状态(1正常 0停用)") + @Schema(description = "帐号状态(1正常 0停用)") private String state; /** * 创建时间 */ - @ApiModelProperty("创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/IpBackVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/IpBackVo.java index 2b9140c..27f8a51 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/IpBackVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/IpBackVo.java @@ -3,7 +3,7 @@ package cn.fateverse.admin.vo; import cn.fateverse.admin.entity.IpBack; import cn.fateverse.common.core.annotaion.Excel; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -24,19 +24,19 @@ public class IpBackVo { /** * 主键id */ - @ApiModelProperty("主键id") + @Schema(description = "主键id") @Excel("id") private Long id; /** * ip地址 */ - @ApiModelProperty("ip地址") + @Schema(description = "ip地址") @Excel("ip地址") private String ipAddr; /** * ip类型 ipv4 ipv6 */ - @ApiModelProperty("ip类型 ipv4 ipv6") + @Schema(description = "ip类型 ipv4 ipv6") @Excel("ip类型 ipv4 ipv6") private String type; /** @@ -45,7 +45,7 @@ public class IpBackVo { @Excel("备注信息") private String remark; - @ApiModelProperty("创建时间") + @Schema(description = "创建时间") @Excel("创建时间") private LocalDateTime createTime; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/MenuSimpVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/MenuSimpVo.java index fb9ef11..06e9c3e 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/MenuSimpVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/MenuSimpVo.java @@ -1,7 +1,7 @@ package cn.fateverse.admin.vo; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -25,48 +25,48 @@ public class MenuSimpVo { /** * 菜单ID */ - @ApiModelProperty("菜单ID") + @Schema(description = "菜单ID") private Long menuId; /** * 菜单名称 */ - @ApiModelProperty("菜单名称") + @Schema(description = "菜单名称") private String menuName; /** * 菜单图标 */ - @ApiModelProperty("菜单图标") + @Schema(description = "菜单图标") private String icon; /** * 显示顺序 */ - @ApiModelProperty("显示顺序") + @Schema(description = "显示顺序") private Integer orderNum; - @ApiModelProperty("显示顺序") + @Schema(description = "显示顺序") private String menuType; /** * 权限字符串 */ - @ApiModelProperty("权限字符串") + @Schema(description = "权限字符串") @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") private String perms; /** * 组件路径 */ - @ApiModelProperty("组件路径") + @Schema(description = "组件路径") private String component; /** * 菜单状态(0显示 1隐藏) */ - @ApiModelProperty("菜单状态(0显示 1隐藏)") + @Schema(description = "菜单状态(0显示 1隐藏)") private String state; /** diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/MenuVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/MenuVo.java index 379f27a..4e9daa3 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/MenuVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/MenuVo.java @@ -1,7 +1,7 @@ package cn.fateverse.admin.vo; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -18,87 +18,87 @@ public class MenuVo implements Serializable { /** * 菜单ID */ - @ApiModelProperty("菜单ID") + @Schema(description = "菜单ID") private Long menuId; /** * 菜单名称 */ - @ApiModelProperty("菜单名称") + @Schema(description = "菜单名称") private String menuName; /** * 父菜单ID */ - @ApiModelProperty("父菜单ID") + @Schema(description = "父菜单ID") private Long parentId; /** * 显示顺序 */ - @ApiModelProperty("显示顺序") + @Schema(description = "显示顺序") private Integer orderNum; /** * 路由地址 */ - @ApiModelProperty("路由地址") + @Schema(description = "路由地址") private String path; - @ApiModelProperty("路径参数") + @Schema(description = "路径参数") private String pathParams; /** * 组件路径 */ - @ApiModelProperty("组件路径") + @Schema(description = "组件路径") private String component; /** * 是否为外链(0是 1否) */ - @ApiModelProperty("是否为外链(0是 1否)") + @Schema(description = "是否为外链(0是 1否)") private Boolean isFrame; /** * 是否缓存(0缓存 1不缓存) */ - @ApiModelProperty("是否缓存(0缓存 1不缓存)") + @Schema(description = "是否缓存(0缓存 1不缓存)") private Boolean isCache; - @ApiModelProperty("不重定向") + @Schema(description = "不重定向") private Boolean noRedirect; - @ApiModelProperty("面包屑") + @Schema(description = "面包屑") private Boolean breadcrumb; /** * 类型(D目录 M菜单 B按钮) */ - @ApiModelProperty("类型(D目录 M菜单 B按钮)") + @Schema(description = "类型(D目录 M菜单 B按钮)") private String menuType; /** * 显示状态(0显示 1隐藏) */ - @ApiModelProperty("显示状态(0显示 1隐藏)") + @Schema(description = "显示状态(0显示 1隐藏)") private String visible; /** * 菜单状态(0显示 1隐藏) */ - @ApiModelProperty("菜单状态(0显示 1隐藏)") + @Schema(description = "菜单状态(0显示 1隐藏)") private String state; /** * 权限字符串 */ - @ApiModelProperty("权限字符串") + @Schema(description = "权限字符串") private String perms; /** * 菜单图标 */ - @ApiModelProperty("菜单图标") + @Schema(description = "菜单图标") private String icon; } diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/OptionMenuVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/OptionMenuVo.java index 8d7c707..d06b0e0 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/OptionMenuVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/OptionMenuVo.java @@ -2,7 +2,7 @@ package cn.fateverse.admin.vo; import cn.fateverse.common.core.entity.OptionTree; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; @@ -18,9 +18,9 @@ import java.util.Set; @ApiModel("角色修改时菜单返回实体") public class OptionMenuVo { - @ApiModelProperty("已选择的") + @Schema(description = "已选择的") private Set checked; - @ApiModelProperty("菜单选择option") + @Schema(description = "菜单选择option") private List menuOption; } diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/PostVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/PostVo.java index a921a2e..49765da 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/PostVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/PostVo.java @@ -3,7 +3,7 @@ package cn.fateverse.admin.vo; import cn.fateverse.admin.entity.Post; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; @@ -23,30 +23,30 @@ public class PostVo { /** * 岗位ID */ - @ApiModelProperty("岗位ID") + @Schema(description = "岗位ID") private Long postId; /** * 岗位编码 */ - @ApiModelProperty("岗位编码") + @Schema(description = "岗位编码") @NotNull(message = "岗位编码不能为空!") private String postCode; /** * 岗位名称 */ - @ApiModelProperty("岗位名称") + @Schema(description = "岗位名称") @NotNull(message = "岗位名称不能为空!") private String postName; /** * 显示顺序 */ - @ApiModelProperty("显示顺序") + @Schema(description = "显示顺序") @NotNull(message = "显示顺序不能为空!") private Integer postSort; /** * 状态(1正常 0停用) */ - @ApiModelProperty("状态(1正常 0停用)") + @Schema(description = "状态(1正常 0停用)") @NotNull(message = "状态不能为空!") private String state; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/RoleVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/RoleVo.java index ee4af26..08d7c36 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/RoleVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/RoleVo.java @@ -2,7 +2,7 @@ package cn.fateverse.admin.vo; import cn.fateverse.common.core.entity.Role; import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -23,42 +23,42 @@ import java.util.Set; @NoArgsConstructor public class RoleVo { - @ApiModelProperty("角色id") + @Schema(description = "角色id") private Long roleId; - @ApiModelProperty("角色名称") + @Schema(description = "角色名称") private String roleName; - @ApiModelProperty("角色权限字符串") + @Schema(description = "角色权限字符串") private String roleKey; - @ApiModelProperty("角色排序") + @Schema(description = "角色排序") private Integer roleSort; /** * 数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限) */ - @ApiModelProperty("数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限)") + @Schema(description = "数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限)") private String dataScope; /** * 角色状态(1正常 0停用) */ - @ApiModelProperty("角色状态(1正常 0停用)") + @Schema(description = "角色状态(1正常 0停用)") private String state; /** * 菜单组 */ - @ApiModelProperty("菜单组") + @Schema(description = "菜单组") @JsonInclude(JsonInclude.Include.NON_NULL) private Set menuIds; /** * 部门组(数据权限) */ - @ApiModelProperty("部门组(数据权限)") + @Schema(description = "部门组(数据权限)") @JsonInclude(JsonInclude.Include.NON_NULL) private Long[] deptIds; private LocalDateTime createTime; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/UserDetailVo.java b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/UserDetailVo.java index f6684bb..d71776e 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/vo/UserDetailVo.java +++ b/admin/admin-api/src/main/java/cn/fateverse/admin/vo/UserDetailVo.java @@ -3,7 +3,7 @@ package cn.fateverse.admin.vo; import cn.fateverse.common.core.entity.Option; import cn.fateverse.common.core.entity.User; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; @@ -17,18 +17,18 @@ import java.util.List; @Builder @ApiModel("用户详细信息") public class UserDetailVo { - @ApiModelProperty("用户基本细腻系") + @Schema(description = "用户基本细腻系") private User user; - @ApiModelProperty("用户所在的岗位") + @Schema(description = "用户所在的岗位") private List postIds; - @ApiModelProperty("岗位option选择数组") + @Schema(description = "岗位option选择数组") private List