diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java index a14d07f2..34e1f9aa 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java @@ -41,7 +41,7 @@ public class UpdateStatusRequest implements Serializable { /** * 状态(1启用 2禁用) */ - @Schema(description = "状态(1启用 2禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态(1:启用,2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") @NotNull(message = "状态非法") private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java index 49ec4346..582cea78 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/AnnouncementQuery.java @@ -40,14 +40,14 @@ public class AnnouncementQuery implements Serializable { /** * 标题 */ - @Schema(description = "标题") + @Schema(description = "标题", example = "这是公告标题") @Query(type = QueryTypeEnum.INNER_LIKE) private String title; /** * 类型(1:活动,2:消息,3:通知) */ - @Schema(description = "类型(1:活动,2:消息,3:通知)") + @Schema(description = "类型(1:活动,2:消息,3:通知)", example = "1") @Query(type = QueryTypeEnum.EQUAL) private Integer type; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/AnnouncementRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/AnnouncementRequest.java index ec3ddeb4..4984d3e2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/AnnouncementRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/AnnouncementRequest.java @@ -44,7 +44,7 @@ public class AnnouncementRequest extends BaseRequest { /** * 标题 */ - @Schema(description = "标题") + @Schema(description = "标题", example = "这是公告标题") @NotBlank(message = "标题不能为空") @Length(max = 255, message = "标题长度不能超过 {max} 个字符") private String title; @@ -52,27 +52,27 @@ public class AnnouncementRequest extends BaseRequest { /** * 内容 */ - @Schema(description = "内容") + @Schema(description = "内容", example = "这是公告内容") @NotBlank(message = "内容不能为空") private String content; /** * 类型 */ - @Schema(description = "类型") + @Schema(description = "类型", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1") @NotNull(message = "类型非法") private AnnouncementTypeEnum type; /** * 生效时间 */ - @Schema(description = "生效时间") + @Schema(description = "生效时间", example = "2023-08-08 00:00:00") private LocalDateTime effectiveTime; /** * 终止时间 */ - @Schema(description = "终止时间") + @Schema(description = "终止时间", example = "2023-08-08 23:59:59") @Future(message = "终止时间必须是未来时间") private LocalDateTime terminateTime; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java index 66f6aa31..93d2ec56 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java @@ -75,7 +75,7 @@ public class DeptRequest extends BaseRequest { /** * 状态(1启用 2禁用) */ - @Schema(description = "状态(1启用 2禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态(1:启用,2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java index 61432c79..595ae258 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java @@ -44,7 +44,7 @@ public class MenuRequest extends BaseRequest { /** * 菜单类型(1目录 2菜单 3按钮) */ - @Schema(description = "菜单类型(1目录 2菜单 3按钮)", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") + @Schema(description = "菜单类型(1:目录,2:菜单,3:按钮)", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") @NotNull(message = "菜单类型非法") private MenuTypeEnum type; @@ -120,6 +120,6 @@ public class MenuRequest extends BaseRequest { /** * 状态(1启用 2禁用) */ - @Schema(description = "状态(1启用 2禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态(1:启用,2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java index 02c6859c..4b09f2ee 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java @@ -52,7 +52,7 @@ public class UpdateBasicInfoRequest implements Serializable { /** * 性别(0未知 1男 2女) */ - @Schema(description = "性别(0未知 1男 2女)", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别(0:未知,1:男,2:女)", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") @NotNull(message = "性别非法") private GenderEnum gender; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementDashboardVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementDashboardVO.java index fe3125c1..c0883da8 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementDashboardVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementDashboardVO.java @@ -45,12 +45,12 @@ public class AnnouncementDashboardVO implements Serializable { /** * 标题 */ - @Schema(description = "标题", example = "这是标题") + @Schema(description = "标题", example = "这是公告标题") private String title; /** * 类型 */ - @Schema(description = "类型") + @Schema(description = "类型", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1") private AnnouncementTypeEnum type; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementDetailVO.java index 2b124dd4..e4c31782 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementDetailVO.java @@ -26,6 +26,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import top.charles7c.cnadmin.common.base.BaseDetailVO; +import top.charles7c.cnadmin.common.config.easyexcel.ExcelBaseEnumConverter; import top.charles7c.cnadmin.system.enums.AnnouncementTypeEnum; /** @@ -44,34 +45,35 @@ public class AnnouncementDetailVO extends BaseDetailVO { /** * 标题 */ - @Schema(description = "标题") + @Schema(description = "标题", example = "这是公告标题") @ExcelProperty(value = "标题") private String title; /** * 内容 */ - @Schema(description = "内容") + @Schema(description = "内容", example = "这是公告内容") @ExcelProperty(value = "内容") private String content; /** * 类型 */ - @Schema(description = "类型") + @Schema(description = "类型", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1") + @ExcelProperty(value = "类型", converter = ExcelBaseEnumConverter.class) private AnnouncementTypeEnum type; /** * 生效时间 */ - @Schema(description = "生效时间") + @Schema(description = "生效时间", example = "2023-08-08 00:00:00") @ExcelProperty(value = "生效时间") private LocalDateTime effectiveTime; /** * 终止时间 */ - @Schema(description = "终止时间") + @Schema(description = "终止时间", example = "2023-08-08 23:59:59") @ExcelProperty(value = "终止时间") private LocalDateTime terminateTime; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java index a7bb24ea..fd08720b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java @@ -40,27 +40,33 @@ public class AnnouncementVO extends BaseVO { /** * 标题 */ - @Schema(description = "标题") + @Schema(description = "标题", example = "这是公告标题") private String title; /** * 类型 */ - @Schema(description = "类型") + @Schema(description = "类型", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1") private AnnouncementTypeEnum type; /** * 生效时间 */ - @Schema(description = "生效时间") + @Schema(description = "生效时间", example = "2023-08-08 00:00:00") private LocalDateTime effectiveTime; /** * 终止时间 */ - @Schema(description = "终止时间") + @Schema(description = "终止时间", example = "2023-08-08 23:59:59") private LocalDateTime terminateTime; + /** + * 状态 + * + * @return 公告状态 + */ + @Schema(description = "状态(1:已发布,2:已过期)", example = "1") public Integer getStatus() { int status = 1; if (null != this.effectiveTime) { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java index 654c0996..7e0790cf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java @@ -72,14 +72,14 @@ public class DeptDetailVO extends BaseDetailVO { /** * 状态(1:启用,2:禁用) */ - @Schema(description = "状态(1:启用,2:禁用)", example = "1") + @Schema(description = "状态(1:启用,2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) private DisEnableStatusEnum status; /** * 类型(1:系统内置,2:自定义) */ - @Schema(description = "类型(1:系统内置,2:自定义)", example = "2") + @Schema(description = "类型(1:系统内置,2:自定义)", type = "Integer", allowableValues = {"1", "2"}, example = "2") @ExcelProperty(value = "类型", converter = ExcelBaseEnumConverter.class) private DataTypeEnum type; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java index 2230079d..fa983d1f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java @@ -59,13 +59,13 @@ public class DeptVO extends BaseVO { /** * 状态(1:启用,2:禁用) */ - @Schema(description = "状态(1:启用,2:禁用)", example = "1") + @Schema(description = "状态(1:启用,2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; /** * 类型(1:系统内置,2:自定义) */ - @Schema(description = "类型(1:系统内置,2:自定义)", example = "2") + @Schema(description = "类型(1:系统内置,2:自定义)", type = "Integer", allowableValues = {"1", "2"}, example = "2") private DataTypeEnum type; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java index 825ca658..a4fcc5e1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java @@ -81,7 +81,7 @@ public class MenuVO extends BaseVO { /** * 状态(1:启用,2:禁用) */ - @Schema(description = "状态(1:启用,2:禁用)", example = "1") + @Schema(description = "状态(1:启用,2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) private DisEnableStatusEnum status; @@ -123,7 +123,7 @@ public class MenuVO extends BaseVO { /** * 菜单类型(1:目录,2:菜单,3:按钮) */ - @Schema(description = "菜单类型(1:目录,2:菜单,3:按钮)", example = "2") + @Schema(description = "菜单类型(1:目录,2:菜单,3:按钮)", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") @ExcelProperty(value = "菜单类型", converter = ExcelBaseEnumConverter.class) private MenuTypeEnum type; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java index dfd98acd..ae49cb47 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java @@ -61,7 +61,8 @@ public class RoleDetailVO extends BaseDetailVO { /** * 数据权限(1:全部数据权限,2:本部门及以下数据权限,3:本部门数据权限,4:仅本人数据权限,5:自定义数据权限) */ - @Schema(description = "数据权限(1:全部数据权限,2:本部门及以下数据权限,3:本部门数据权限,4:仅本人数据权限,5:自定义数据权限)", example = "5") + @Schema(description = "数据权限(1:全部数据权限,2:本部门及以下数据权限,3:本部门数据权限,4:仅本人数据权限,5:自定义数据权限)", type = "Integer", + allowableValues = {"1", "2", "3", "4", "5"}, example = "5") @ExcelProperty(value = "数据权限", converter = ExcelBaseEnumConverter.class) private DataScopeEnum dataScope; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java index c48d50db..cf2659f2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java @@ -52,7 +52,8 @@ public class RoleVO extends BaseVO { /** * 数据权限(1:全部数据权限,2:本部门及以下数据权限,3:本部门数据权限,4:仅本人数据权限,5:自定义数据权限) */ - @Schema(description = "数据权限(1:全部数据权限,2:本部门及以下数据权限,3:本部门数据权限,4:仅本人数据权限,5:自定义数据权限)", example = "5") + @Schema(description = "数据权限(1:全部数据权限,2:本部门及以下数据权限,3:本部门数据权限,4:仅本人数据权限,5:自定义数据权限)", type = "Integer", + allowableValues = {"1", "2", "3", "4", "5"}, example = "5") private DataScopeEnum dataScope; /** @@ -64,13 +65,13 @@ public class RoleVO extends BaseVO { /** * 状态(1:启用,2:禁用) */ - @Schema(description = "状态(1:启用,2:禁用)", example = "1") + @Schema(description = "状态(1:启用,2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; /** * 类型(1:系统内置,2:自定义) */ - @Schema(description = "类型(1:系统内置,2:自定义)", example = "2") + @Schema(description = "类型(1:系统内置,2:自定义)", type = "Integer", allowableValues = {"1", "2"}, example = "2") private DataTypeEnum type; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java index d7791060..c88d6f2e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java @@ -64,7 +64,7 @@ public class UserDetailVO extends BaseDetailVO { /** * 性别(0:未知,1:男,2:女) */ - @Schema(description = "性别(0:未知,1:男,2:女)", example = "1") + @Schema(description = "性别(0:未知,1:男,2:女)", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") @ExcelProperty(value = "性别", converter = ExcelBaseEnumConverter.class) private GenderEnum gender; @@ -93,14 +93,14 @@ public class UserDetailVO extends BaseDetailVO { /** * 状态(1:启用,2:禁用) */ - @Schema(description = "状态(1:启用,2:禁用)", example = "1") + @Schema(description = "状态(1:启用,2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) private DisEnableStatusEnum status; /** * 类型(1:系统内置,2:自定义) */ - @Schema(description = "类型(1:系统内置,2:自定义)", example = "2") + @Schema(description = "类型(1:系统内置,2:自定义)", type = "Integer", allowableValues = {"1", "2"}, example = "2") @ExcelProperty(value = "类型", converter = ExcelBaseEnumConverter.class) private DataTypeEnum type; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java index 947f303e..4e5d06a1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java @@ -57,7 +57,7 @@ public class UserVO extends BaseVO { /** * 性别(0:未知,1:男,2:女) */ - @Schema(description = "性别(0:未知,1:男,2:女)", example = "1") + @Schema(description = "性别(0:未知,1:男,2:女)", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") private GenderEnum gender; /** @@ -82,13 +82,13 @@ public class UserVO extends BaseVO { /** * 状态(1:启用,2:禁用) */ - @Schema(description = "状态(1:启用,2:禁用)", example = "1") + @Schema(description = "状态(1:启用,2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; /** * 类型(1:系统内置,2:自定义) */ - @Schema(description = "类型(1:系统内置,2:自定义)", example = "2") + @Schema(description = "类型(1:系统内置,2:自定义)", type = "Integer", allowableValues = {"1", "2"}, example = "2") private DataTypeEnum type; /** diff --git a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java index 71838a5a..247f5dbb 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java +++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java @@ -122,13 +122,14 @@ public class FieldConfigDO implements Serializable { /** * 表单类型 */ - @Schema(description = "表单类型", example = "1") + @Schema(description = "表单类型", type = "Integer", allowableValues = {"1", "2", "3", "4", "5", "6"}, example = "1") private FormTypeEnum formType; /** * 查询方式 */ - @Schema(description = "查询方式", example = "1") + @Schema(description = "查询方式", type = "Integer", + allowableValues = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14"}, example = "1") private QueryTypeEnum queryType; /** diff --git a/continew-admin-webapi/src/main/resources/application.yml b/continew-admin-webapi/src/main/resources/application.yml index b7f949ce..ca278a58 100644 --- a/continew-admin-webapi/src/main/resources/application.yml +++ b/continew-admin-webapi/src/main/resources/application.yml @@ -68,7 +68,9 @@ springdoc: packages-to-scan: ${project.basePackage}.webapi.controller.auth - group: 'common' display-name: '通用接口' - paths-to-match: '/common/**' + paths-to-match: + - '/common/**' + - '/dashboard/**' packages-to-scan: ${project.basePackage}.webapi.controller.common - group: 'system' display-name: '系统管理'