diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java index 7f669caa..f22761f4 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java @@ -57,4 +57,9 @@ public enum DataScopeEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java index 4996a271..305fb7e2 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java @@ -44,4 +44,9 @@ public enum DisEnableStatusEnum implements IBaseEnum { private final Integer value; private final String description; private final String color; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java index 24cd8897..9f1f7f42 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java @@ -47,4 +47,9 @@ public enum GenderEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java index d5659c5e..09b55009 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/MenuTypeEnum.java @@ -47,4 +47,9 @@ public enum MenuTypeEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java index 0aba86c8..f8f8b113 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/MessageTypeEnum.java @@ -39,4 +39,9 @@ public enum MessageTypeEnum implements IBaseEnum { private final Integer value; private final String description; private final String color; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java b/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java index 1212653e..2cff8df0 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java @@ -44,4 +44,9 @@ public enum SuccessFailureStatusEnum implements IBaseEnum { private final Integer value; private final String description; private final String color; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java index 61e90de8..d3f992de 100644 --- a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java +++ b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java @@ -88,4 +88,9 @@ public enum FormTypeEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java index a5e80098..f11b9c71 100644 --- a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java +++ b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java @@ -103,4 +103,9 @@ public enum QueryTypeEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java index 6fe4e532..8729c05c 100644 --- a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java +++ b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java @@ -132,14 +132,13 @@ public class FieldConfigDO implements Serializable { /** * 表单类型 */ - @Schema(description = "表单类型", type = "Integer", allowableValues = {"1", "2", "3", "4", "5", "6"}, example = "1") + @Schema(description = "表单类型", example = "1") private FormTypeEnum formType; /** * 查询方式 */ - @Schema(description = "查询方式", type = "Integer", allowableValues = {"1", "2", "3", "4", "5", "6", "7", "8", "9", - "10", "11", "12", "13", "14"}, example = "1") + @Schema(description = "查询方式", example = "1") private QueryTypeEnum queryType; /** diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java index fe5a6d25..9a41f6fe 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java @@ -47,4 +47,9 @@ public enum JobBlockStrategyEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java index 42c18c55..464207b6 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java @@ -132,4 +132,9 @@ public enum JobExecuteReasonEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java index 7fbf109c..26f7f6d2 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java @@ -64,4 +64,9 @@ public enum JobExecuteStatusEnum implements IBaseEnum { private final Integer value; private final String description; private final String color; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java index 8049eafd..e8144581 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java @@ -52,4 +52,9 @@ public enum JobRouteStrategyEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java index d902e4ea..4c324136 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java @@ -44,4 +44,9 @@ public enum JobStatusEnum implements IBaseEnum { private final Integer value; private final String description; private final String color; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java index e6a2b737..0cebde65 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java @@ -49,4 +49,9 @@ public enum JobTaskTypeEnum implements IBaseEnum { private final Integer value; private final String description; private final String color; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java index 55ea9101..e3bc71d1 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java @@ -42,4 +42,9 @@ public enum JobTriggerTypeEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobLogQuery.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobLogQuery.java index b1fc4e43..0771e234 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobLogQuery.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobLogQuery.java @@ -23,6 +23,7 @@ import jakarta.validation.constraints.Size; import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.format.annotation.DateTimeFormat; +import top.continew.admin.job.enums.JobExecuteStatusEnum; import java.io.Serial; import java.io.Serializable; @@ -63,7 +64,7 @@ public class JobLogQuery implements Serializable { * 任务批次状态 */ @Schema(description = "任务批次状态", example = "1") - private Integer taskBatchStatus; + private JobExecuteStatusEnum taskBatchStatus; /** * 创建时间 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobQuery.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobQuery.java index da53bf2b..eff1daa3 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobQuery.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobQuery.java @@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import lombok.Data; import org.hibernate.validator.constraints.Range; +import top.continew.admin.job.enums.JobStatusEnum; import java.io.Serial; import java.io.Serializable; @@ -53,7 +54,7 @@ public class JobQuery implements Serializable { * 任务状态 */ @Schema(description = "任务状态", example = "1") - private Integer jobStatus; + private JobStatusEnum jobStatus; /** * 页码 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java index f881f616..7bcf9421 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java @@ -49,7 +49,8 @@ public class JobLogServiceImpl implements JobLogService { @Override public PageResp page(JobLogQuery query) { return jobClient.requestPage(() -> jobBatchApi.page(query.getJobId(), query.getJobName(), query - .getGroupName(), query.getTaskBatchStatus(), query.getDatetimeRange(), query.getPage(), query.getSize())); + .getGroupName(), query.getTaskBatchStatus().getValue(), query.getDatetimeRange(), query.getPage(), query + .getSize())); } @Override diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java index 2b9c85ae..3437f383 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java +++ b/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java @@ -45,8 +45,8 @@ public class JobServiceImpl implements JobService { @Override public PageResp page(JobQuery query) { - return jobClient.requestPage(() -> jobApi.page(query.getGroupName(), query.getJobName(), query - .getJobStatus(), query.getPage(), query.getSize())); + return jobClient.requestPage(() -> jobApi.page(query.getGroupName(), query.getJobName(), query.getJobStatus() + .getValue(), query.getPage(), query.getSize())); } @Override diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java b/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java index 2e5a0aef..0840185b 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java @@ -63,7 +63,7 @@ public class UserInfoResp implements Serializable { /** * 性别 */ - @Schema(description = "性别(0:未知;1:男;2:女)", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别", example = "1") private GenderEnum gender; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java index dfb55a12..1f7239f9 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java @@ -65,6 +65,11 @@ public enum FileTypeEnum implements IBaseEnum { private final String description; private final List extensions; + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } + /** * 根据扩展名查询 * diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java index 81aad959..c7e0544e 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java @@ -51,6 +51,11 @@ public enum ImportPolicyEnum implements IBaseEnum { private final Integer value; private final String description; + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } + public boolean validate(ImportPolicyEnum importPolicy, String data, List existList) { return this == importPolicy && CollUtil.isNotEmpty(existList) && existList.contains(data); } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java index 97783f93..9a9d2f63 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java @@ -42,4 +42,9 @@ public enum LogStatusEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java index bca3991c..0ba5144f 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java @@ -52,6 +52,11 @@ public enum NoticeStatusEnum implements IBaseEnum { private final String description; private final String color; + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } + /** * 获取公告状态 * diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java b/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java index 3a54827b..32edb447 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java @@ -42,4 +42,9 @@ public enum StorageTypeEnum implements IBaseEnum { private final Integer value; private final String description; + + @Override + public String toString() { + return "%s: %s".formatted(this.value, this.description); + } } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java index 0a2bce62..1d665888 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java @@ -72,7 +72,7 @@ public class DeptReq extends BaseReq { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") private DisEnableStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java index c8bfbf57..52d44637 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java @@ -80,7 +80,7 @@ public class DictItemReq extends BaseReq { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") private DisEnableStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java index b2b99210..7f2e8aaa 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java @@ -44,7 +44,7 @@ public class MenuReq extends BaseReq { /** * 类型 */ - @Schema(description = "类型(1:目录;2:菜单;3:按钮)", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") + @Schema(description = "类型", example = "2") @NotNull(message = "类型非法") private MenuTypeEnum type; @@ -132,7 +132,7 @@ public class MenuReq extends BaseReq { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") @NotNull(message = "状态非法") private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java index d23ede21..61ebe76c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java @@ -82,8 +82,7 @@ public class RoleReq extends BaseReq { /** * 数据权限 */ - @Schema(description = "数据权限(1:全部数据权限;2:本部门及以下数据权限;3:本部门数据权限;4:仅本人数据权限;5:自定义数据权限)", type = "Integer", allowableValues = { - "1", "2", "3", "4", "5"}, example = "5") + @Schema(description = "数据权限", example = "5") private DataScopeEnum dataScope; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java index 491846fb..bc54fb7a 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java @@ -62,7 +62,7 @@ public class StorageReq extends BaseReq { /** * 类型 */ - @Schema(description = "类型", type = "Integer", allowableValues = {"1", "2"}, example = "2") + @Schema(description = "类型", example = "2") @NotNull(message = "类型非法") private StorageTypeEnum type; @@ -129,6 +129,6 @@ public class StorageReq extends BaseReq { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") private DisEnableStatusEnum status; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserBasicInfoUpdateReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserBasicInfoUpdateReq.java index 318a4314..82d1080d 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserBasicInfoUpdateReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserBasicInfoUpdateReq.java @@ -51,7 +51,7 @@ public class UserBasicInfoUpdateReq implements Serializable { /** * 性别 */ - @Schema(description = "性别(0:未知;1:男;2:女)", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别", example = "1") @NotNull(message = "性别非法") private GenderEnum gender; } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserImportReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserImportReq.java index 76a2ee25..41201efe 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserImportReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserImportReq.java @@ -49,27 +49,27 @@ public class UserImportReq extends BaseReq { /** * 用户重复策略 */ - @Schema(description = "重复用户策略", type = "Integer", allowableValues = {"1", "2", "3", "4"}, example = "1") + @Schema(description = "重复用户策略", example = "1") @NotNull(message = "重复用户策略不能为空") private ImportPolicyEnum duplicateUser; /** * 重复邮箱策略 */ - @Schema(description = "重复邮箱策略", type = "Integer", allowableValues = {"1", "2", "3", "4"}, example = "1") + @Schema(description = "重复邮箱策略", example = "1") @NotNull(message = "重复邮箱策略不能为空") private ImportPolicyEnum duplicateEmail; /** * 重复手机策略 */ - @Schema(description = "重复手机策略", type = "Integer", allowableValues = {"1", "2", "3", "4"}, example = "1") + @Schema(description = "重复手机策略", example = "1") @NotNull(message = "重复手机策略不能为空") private ImportPolicyEnum duplicatePhone; /** * 默认状态 */ - @Schema(description = "默认状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "默认状态", example = "1") private DisEnableStatusEnum defaultStatus; } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserReq.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserReq.java index 509cfb87..89397393 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserReq.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/req/UserReq.java @@ -87,7 +87,7 @@ public class UserReq extends BaseReq { /** * 性别 */ - @Schema(description = "性别(0:未知;1:男;2:女)", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别", example = "1") @NotNull(message = "性别非法") private GenderEnum gender; @@ -115,6 +115,6 @@ public class UserReq extends BaseReq { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java index 3d9204f6..df9b9ea6 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java @@ -59,7 +59,7 @@ public class DeptResp extends BaseDetailResp { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class, order = 5) private DisEnableStatusEnum status; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java index 1a79ce1c..c23f8fbe 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java @@ -59,7 +59,7 @@ public class DictItemResp extends BaseDetailResp { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) private DisEnableStatusEnum status; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java index 05c83523..21fc025d 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java @@ -65,8 +65,7 @@ public class FileResp extends BaseDetailResp { /** * 类型 */ - @Schema(description = "类型(1:其他;2:图片;3:文档;4:视频;5:音频)", type = "Integer", allowableValues = {"1", "2", "3", "4", - "5"}, example = "2") + @Schema(description = "类型", example = "2") private FileTypeEnum type; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java index c03d564b..ad74cb6d 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java @@ -42,8 +42,7 @@ public class FileStatisticsResp implements Serializable { /** * 文件类型 */ - @Schema(description = "类型(1:其他;2:图片;3:文档;4:视频;5:音频)", type = "Integer", allowableValues = {"1", "2", "3", "4", - "5"}, example = "2") + @Schema(description = "类型", example = "2") private FileTypeEnum type; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java index 676c8e72..9df9b086 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java @@ -54,7 +54,7 @@ public class MenuResp extends BaseResp { /** * 类型 */ - @Schema(description = "类型(1:目录;2:菜单;3:按钮)", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") + @Schema(description = "类型", example = "2") private MenuTypeEnum type; /** @@ -120,6 +120,6 @@ public class MenuResp extends BaseResp { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java index bddf7eb5..9bc8fe3d 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java @@ -66,7 +66,7 @@ public class NoticeResp extends BaseResp { * * @return 公告状态 */ - @Schema(description = "状态(1:待发布;2:已发布;3:已过期)", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1") + @Schema(description = "状态", example = "1") public NoticeStatusEnum getStatus() { return NoticeStatusEnum.getStatus(effectiveTime, terminateTime); } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java index 652efc66..3698b4d8 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java @@ -63,8 +63,7 @@ public class RoleDetailResp extends BaseDetailResp { /** * 数据权限 */ - @Schema(description = "数据权限(1:全部数据权限;2:本部门及以下数据权限;3:本部门数据权限;4:仅本人数据权限;5:自定义数据权限)", type = "Integer", allowableValues = { - "1", "2", "3", "4", "5"}, example = "5") + @Schema(description = "数据权限", example = "5") @ExcelProperty(value = "数据权限", converter = ExcelBaseEnumConverter.class) private DataScopeEnum dataScope; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java index d437edd2..b5b0f6f1 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java @@ -51,8 +51,7 @@ public class RoleResp extends BaseDetailResp { /** * 数据权限 */ - @Schema(description = "数据权限(1:全部数据权限;2:本部门及以下数据权限;3:本部门数据权限;4:仅本人数据权限;5:自定义数据权限)", type = "Integer", allowableValues = { - "1", "2", "3", "4", "5"}, example = "5") + @Schema(description = "数据权限", example = "5") private DataScopeEnum dataScope; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java index 9bfde352..2c93a14d 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java @@ -53,13 +53,13 @@ public class StorageResp extends BaseDetailResp { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") private DisEnableStatusEnum status; /** * 类型 */ - @Schema(description = "类型(1:兼容S3协议存储;2:本地存储)", type = "Integer", allowableValues = {"1", "2"}, example = "2") + @Schema(description = "类型", example = "2") private StorageTypeEnum type; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java index eca8faf3..33488644 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserDetailResp.java @@ -73,14 +73,14 @@ public class UserDetailResp extends BaseDetailResp { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class, order = 4) private DisEnableStatusEnum status; /** * 性别 */ - @Schema(description = "性别(0:未知;1:男;2:女)", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别", example = "1") @ExcelProperty(value = "性别", converter = ExcelBaseEnumConverter.class, order = 5) private GenderEnum gender; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserResp.java index 053be89b..a7062a55 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/UserResp.java @@ -61,7 +61,7 @@ public class UserResp extends BaseDetailResp { /** * 性别 */ - @Schema(description = "性别(0:未知;1:男;2:女)", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别", example = "1") private GenderEnum gender; /** @@ -87,7 +87,7 @@ public class UserResp extends BaseDetailResp { /** * 状态 */ - @Schema(description = "状态(1:启用;2:禁用)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") private DisEnableStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java index a3883b13..9238963f 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java @@ -140,7 +140,7 @@ public class LogDetailResp implements Serializable { /** * 状态 */ - @Schema(description = "状态(1:成功;2:失败)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") private LogStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java index a93ef9af..06024ac9 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java @@ -89,7 +89,7 @@ public class LogResp implements Serializable { /** * 状态 */ - @Schema(description = "状态(1:成功;2:失败)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") private LogStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java index a3efde02..3426b99c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java @@ -72,7 +72,7 @@ public class LoginLogExportResp implements Serializable { /** * 状态 */ - @Schema(description = "状态(1:成功;2:失败)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) private LogStatusEnum status; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java index 29233ea4..c7f3b9a4 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java @@ -79,7 +79,7 @@ public class OperationLogExportResp implements Serializable { /** * 状态 */ - @Schema(description = "状态(1:成功;2:失败)", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态", example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) private LogStatusEnum status;