批量将 required = true 替换成 requiredMode = Schema.RequiredMode.REQUIRED

pull/46/head
YunaiV 2023-07-26 20:52:15 +08:00
parent 6331054678
commit 9e01afc1da
197 changed files with 882 additions and 935 deletions

View File

@ -1,8 +1,9 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/** /**
* Base VO VO 使 * Base VO VO 使
@ -11,15 +12,15 @@ import javax.validation.constraints.*;
@Data @Data
public class BpmFormBaseVO { public class BpmFormBaseVO {
@Schema(description = "表单名称", required = true, example = "芋道") @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@NotNull(message = "表单名称不能为空") @NotNull(message = "表单名称不能为空")
private String name; private String name;
@Schema(description = "表单状态,参见 CommonStatusEnum 枚举", required = true, example = "1") @Schema(description = "表单状态-参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "表单状态不能为空") @NotNull(message = "表单状态不能为空")
private Integer status; private Integer status;
@Schema(description = "备注", example = "我是备注") @Schema(description = "备注", example = "我是备注")
private String remark; private String remark;
} }

View File

@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
@ -12,12 +14,12 @@ import java.util.List;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmFormCreateReqVO extends BpmFormBaseVO { public class BpmFormCreateReqVO extends BpmFormBaseVO {
@Schema(description = "表单的配置,JSON 字符串", required = true) @Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单的配置不能为空") @NotNull(message = "表单的配置不能为空")
private String conf; private String conf;
@Schema(description = "表单项的数组,JSON 字符串的数组", required = true) @Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单项的数组不能为空") @NotNull(message = "表单项的数组不能为空")
private List<String> fields; private List<String> fields;
} }

View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@ -16,4 +15,4 @@ public class BpmFormPageReqVO extends PageParam {
@Schema(description = "表单名称", example = "芋道") @Schema(description = "表单名称", example = "芋道")
private String name; private String name;
} }

View File

@ -1,6 +1,4 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -16,18 +14,18 @@ import java.util.List;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmFormRespVO extends BpmFormBaseVO { public class BpmFormRespVO extends BpmFormBaseVO {
@Schema(description = "表单编号", required = true, example = "1024") @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "表单的配置,JSON 字符串", required = true) @Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单的配置不能为空") @NotNull(message = "表单的配置不能为空")
private String conf; private String conf;
@Schema(description = "表单项的数组,JSON 字符串的数组", required = true) @Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单项的数组不能为空") @NotNull(message = "表单项的数组不能为空")
private List<String> fields; private List<String> fields;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -8,10 +7,10 @@ import lombok.Data;
@Data @Data
public class BpmFormSimpleRespVO { public class BpmFormSimpleRespVO {
@Schema(description = "表单编号", required = true, example = "1024") @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "表单名称", required = true, example = "芋道") @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name; private String name;
} }

View File

@ -1,8 +1,11 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import javax.validation.constraints.*; import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
@Schema(description = "管理后台 - 动态表单更新 Request VO") @Schema(description = "管理后台 - 动态表单更新 Request VO")
@ -11,16 +14,16 @@ import java.util.List;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmFormUpdateReqVO extends BpmFormBaseVO { public class BpmFormUpdateReqVO extends BpmFormBaseVO {
@Schema(description = "表单编号", required = true, example = "1024") @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "表单编号不能为空") @NotNull(message = "表单编号不能为空")
private Long id; private Long id;
@Schema(description = "表单的配置,JSON 字符串", required = true) @Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单的配置不能为空") @NotNull(message = "表单的配置不能为空")
private String conf; private String conf;
@Schema(description = "表单项的数组,JSON 字符串的数组", required = true) @Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单项的数组不能为空") @NotNull(message = "表单项的数组不能为空")
private List<String> fields; private List<String> fields;
} }

View File

@ -1,9 +1,10 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import java.util.*;
import javax.validation.constraints.*; import javax.validation.constraints.NotNull;
import java.util.Set;
/** /**
* Base VO VO 使 * Base VO VO 使
@ -12,20 +13,20 @@ import javax.validation.constraints.*;
@Data @Data
public class BpmUserGroupBaseVO { public class BpmUserGroupBaseVO {
@Schema(description = "组名", required = true, example = "芋道") @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@NotNull(message = "组名不能为空") @NotNull(message = "组名不能为空")
private String name; private String name;
@Schema(description = "描述", required = true, example = "芋道源码") @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
@NotNull(message = "描述不能为空") @NotNull(message = "描述不能为空")
private String description; private String description;
@Schema(description = "成员编号数组", required = true, example = "1,2,3") @Schema(description = "成员编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")
@NotNull(message = "成员编号数组不能为空") @NotNull(message = "成员编号数组不能为空")
private Set<Long> memberUserIds; private Set<Long> memberUserIds;
@Schema(description = "状态", required = true, example = "1") @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "状态不能为空") @NotNull(message = "状态不能为空")
private Integer status; private Integer status;
} }

View File

@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@Schema(description = "管理后台 - 用户组创建 Request VO") @Schema(description = "管理后台 - 用户组创建 Request VO")
@Data @Data
@ -9,4 +11,4 @@ import lombok.*;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmUserGroupCreateReqVO extends BpmUserGroupBaseVO { public class BpmUserGroupCreateReqVO extends BpmUserGroupBaseVO {
} }

View File

@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.date.DateUtils; import cn.iocoder.yudao.framework.common.util.date.DateUtils;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@ -27,4 +26,4 @@ public class BpmUserGroupPageReqVO extends PageParam {
@Schema(description = "创建时间") @Schema(description = "创建时间")
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
} }

View File

@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -11,10 +13,10 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmUserGroupRespVO extends BpmUserGroupBaseVO { public class BpmUserGroupRespVO extends BpmUserGroupBaseVO {
@Schema(description = "编号", required = true, example = "1024") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -12,10 +11,10 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
public class BpmUserGroupSimpleRespVO { public class BpmUserGroupSimpleRespVO {
@Schema(description = "用户组编号", required = true, example = "1024") @Schema(description = "用户组编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "用户组名字", required = true, example = "芋道") @Schema(description = "用户组名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name; private String name;
} }

View File

@ -1,8 +1,11 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import javax.validation.constraints.*; import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 用户组更新 Request VO") @Schema(description = "管理后台 - 用户组更新 Request VO")
@Data @Data
@ -10,8 +13,8 @@ import javax.validation.constraints.*;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmUserGroupUpdateReqVO extends BpmUserGroupBaseVO { public class BpmUserGroupUpdateReqVO extends BpmUserGroupBaseVO {
@Schema(description = "编号", required = true, example = "1024") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "编号不能为空") @NotNull(message = "编号不能为空")
private Long id; private Long id;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -9,14 +8,14 @@ import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 流程模型的导入 Request VO,相比流程模型的新建来说,只是多了一个 bpmnFile 文件") @Schema(description = "管理后台 - 流程模型的导入 Request VO 相比流程模型的新建来说,只是多了一个 bpmnFile 文件")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmModeImportReqVO extends BpmModelCreateReqVO { public class BpmModeImportReqVO extends BpmModelCreateReqVO {
@Schema(description = "BPMN 文件", required = true) @Schema(description = "BPMN 文件", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "BPMN 文件不能为空") @NotNull(message = "BPMN 文件不能为空")
private MultipartFile bpmnFile; private MultipartFile bpmnFile;
} }

View File

@ -1,5 +1,4 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -12,28 +11,30 @@ import javax.validation.constraints.NotEmpty;
@Data @Data
public class BpmModelBaseVO { public class BpmModelBaseVO {
@Schema(description = "流程标识", required = true, example = "process_yudao") @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_yudao")
@NotEmpty(message = "流程标识不能为空") @NotEmpty(message = "流程标识不能为空")
private String key; private String key;
@Schema(description = "流程名称", required = true, example = "芋道") @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@NotEmpty(message = "流程名称不能为空") @NotEmpty(message = "流程名称不能为空")
private String name; private String name;
@Schema(description = "流程描述", example = "我是描述") @Schema(description = "流程描述", example = "我是描述")
private String description; private String description;
@Schema(description = "流程分类,参见 bpm_model_category 数据字典", example = "1") @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
@NotEmpty(message = "流程分类不能为空") @NotEmpty(message = "流程分类不能为空")
private String category; private String category;
@Schema(description = "表单类型,参见 bpm_model_form_type 数据字典", example = "1") @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
private Integer formType; private Integer formType;
@Schema(description = "表单编号,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "1024") @Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "1024")
private Long formId; private Long formId;
@Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "/bpm/oa/leave/create") @Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空",
example = "/bpm/oa/leave/create")
private String formCustomCreatePath; private String formCustomCreatePath;
@Schema(description = "自定义表单的查看路径,使用 Vue 的路由地址,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "/bpm/oa/leave/view" ) @Schema(description = "自定义表单的查看路径,使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空",
example = "/bpm/oa/leave/view")
private String formCustomViewPath; private String formCustomViewPath;
} }

View File

@ -1,10 +1,7 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
@ -12,15 +9,15 @@ import javax.validation.constraints.NotEmpty;
@Data @Data
public class BpmModelCreateReqVO { public class BpmModelCreateReqVO {
@Schema(description = "流程标识", required = true, example = "process_yudao") @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_yudao")
@NotEmpty(message = "流程标识不能为空") @NotEmpty(message = "流程标识不能为空")
private String key; private String key;
@Schema(description = "流程名称", required = true, example = "芋道") @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@NotEmpty(message = "流程名称不能为空") @NotEmpty(message = "流程名称不能为空")
private String name; private String name;
@Schema(description = "流程描述", example = "我是描述") @Schema(description = "流程描述", example = "我是描述")
private String description; private String description;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -14,13 +13,13 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmModelPageItemRespVO extends BpmModelBaseVO { public class BpmModelPageItemRespVO extends BpmModelBaseVO {
@Schema(description = "编号", required = true, example = "1024") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "表单名字", example = "请假表单") @Schema(description = "表单名字", example = "请假表单")
private String formName; private String formName;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
@ -32,18 +31,18 @@ public class BpmModelPageItemRespVO extends BpmModelBaseVO {
@Data @Data
public static class ProcessDefinition { public static class ProcessDefinition {
@Schema(description = "编号", required = true, example = "1024") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "版本", required = true, example = "1") @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer version; private Integer version;
@Schema(description = "部署时间", required = true) @Schema(description = "部署时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime deploymentTime; private LocalDateTime deploymentTime;
@Schema(description = "中断状态,参见 SuspensionState 枚举", required = true, example = "1") @Schema(description = "中断状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer suspensionState; private Integer suspensionState;
} }
} }

View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@ -14,13 +13,13 @@ import lombok.ToString;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmModelPageReqVO extends PageParam { public class BpmModelPageReqVO extends PageParam {
@Schema(description = "标识,精准匹配", example = "process1641042089407") @Schema(description = "标识-精准匹配", example = "process1641042089407")
private String key; private String key;
@Schema(description = "名字,精准匹配", example = "芋道") @Schema(description = "名字-模糊匹配", example = "芋道")
private String name; private String name;
@Schema(description = "流程分类,参见 bpm_model_category 数据字典", example = "1") @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
private String category; private String category;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -14,13 +13,13 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmModelRespVO extends BpmModelBaseVO { public class BpmModelRespVO extends BpmModelBaseVO {
@Schema(description = "编号", required = true, example = "1024") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "BPMN XML", required = true) @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
private String bpmnXml; private String bpmnXml;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -10,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
@Data @Data
public class BpmModelUpdateReqVO { public class BpmModelUpdateReqVO {
@Schema(description = "编号", required = true, example = "1024") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "编号不能为空") @NotEmpty(message = "编号不能为空")
private String id; private String id;
@ -20,19 +19,21 @@ public class BpmModelUpdateReqVO {
@Schema(description = "流程描述", example = "我是描述") @Schema(description = "流程描述", example = "我是描述")
private String description; private String description;
@Schema(description = "流程分类,参见 bpm_model_category 数据字典", example = "1") @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
private String category; private String category;
@Schema(description = "BPMN XML", required = true) @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
private String bpmnXml; private String bpmnXml;
@Schema(description = "表单类型,参见 bpm_model_form_type 数据字典", example = "1") @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
private Integer formType; private Integer formType;
@Schema(description = "表单编号,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "1024") @Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "1024")
private Long formId; private Long formId;
@Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "/bpm/oa/leave/create") @Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空",
example = "/bpm/oa/leave/create")
private String formCustomCreatePath; private String formCustomCreatePath;
@Schema(description = "自定义表单的查看路径,使用 Vue 的路由地址,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "/bpm/oa/leave/view" ) @Schema(description = "自定义表单的查看路径,使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空",
example = "/bpm/oa/leave/view")
private String formCustomViewPath; private String formCustomViewPath;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -10,12 +9,12 @@ import javax.validation.constraints.NotNull;
@Data @Data
public class BpmModelUpdateStateReqVO { public class BpmModelUpdateStateReqVO {
@Schema(description = "编号", required = true, example = "1024") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "编号不能为空") @NotNull(message = "编号不能为空")
private String id; private String id;
@Schema(description = "状态,见 SuspensionState 枚举", required = true, example = "1") @Schema(description = "状态-见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "状态不能为空") @NotNull(message = "状态不能为空")
private Integer state; private Integer state;
} }

View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@ -13,7 +12,7 @@ import lombok.ToString;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class BpmProcessDefinitionListReqVO extends PageParam { public class BpmProcessDefinitionListReqVO extends PageParam {
@Schema(description = "中断状态,参见 SuspensionState 枚举", example = "1") @Schema(description = "中断状态-参见 SuspensionState 枚举", example = "1")
private Integer suspensionState; private Integer suspensionState;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -17,7 +16,7 @@ public class BpmProcessDefinitionPageItemRespVO extends BpmProcessDefinitionResp
@Schema(description = "表单名字", example = "请假表单") @Schema(description = "表单名字", example = "请假表单")
private String formName; private String formName;
@Schema(description = "部署时间", required = true) @Schema(description = "部署时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime deploymentTime; private LocalDateTime deploymentTime;
} }

View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@ -13,7 +12,7 @@ import lombok.ToString;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class BpmProcessDefinitionPageReqVO extends PageParam { public class BpmProcessDefinitionPageReqVO extends PageParam {
@Schema(description = "标识,精准匹配", example = "process1641042089407") @Schema(description = "标识-精准匹配", example = "process1641042089407")
private String key; private String key;
} }

View File

@ -1,48 +1,48 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
@Schema(description = "管理后台 - 流程定义 Response VO") @Schema(description = "管理后台 - 流程定义 Response VO")
@Data @Data
public class BpmProcessDefinitionRespVO { public class BpmProcessDefinitionRespVO {
@Schema(description = "编号", required = true, example = "1024") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "版本", required = true, example = "1") @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer version; private Integer version;
@Schema(description = "流程名称", required = true, example = "芋道") @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@NotEmpty(message = "流程名称不能为空") @NotEmpty(message = "流程名称不能为空")
private String name; private String name;
@Schema(description = "流程描述", example = "我是描述") @Schema(description = "流程描述", example = "我是描述")
private String description; private String description;
@Schema(description = "流程分类,参见 bpm_model_category 数据字典", example = "1") @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
@NotEmpty(message = "流程分类不能为空") @NotEmpty(message = "流程分类不能为空")
private String category; private String category;
@Schema(description = "表单类型,参见 bpm_model_form_type 数据字典", example = "1") @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
private Integer formType; private Integer formType;
@Schema(description = "表单编号,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "1024") @Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "1024")
private Long formId; private Long formId;
@Schema(description = "表单的配置,JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", required = true ) @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
private String formConf; private String formConf;
@Schema(description = "表单项的数组,JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", required = true ) @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
private List<String> formFields; private List<String> formFields;
@Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "/bpm/oa/leave/create" ) @Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空",
example = "/bpm/oa/leave/create")
private String formCustomCreatePath; private String formCustomCreatePath;
@Schema(description = "自定义表单的查看路径,使用 Vue 的路由地址,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "/bpm/oa/leave/view") @Schema(description = "自定义表单的查看路径,使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空",
example = "/bpm/oa/leave/view")
private String formCustomViewPath; private String formCustomViewPath;
@Schema(description = "中断状态,参见 SuspensionState 枚举", required = true, example = "1") @Schema(description = "中断状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer suspensionState; private Integer suspensionState;
} }

View File

@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Set; import java.util.Set;
@ -14,12 +13,12 @@ import java.util.Set;
@Data @Data
public class BpmTaskAssignRuleBaseVO { public class BpmTaskAssignRuleBaseVO {
@Schema(description = "规则类型", required = true, example = "bpm_task_assign_rule_type") @Schema(description = "规则类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "bpm_task_assign_rule_type")
@NotNull(message = "规则类型不能为空") @NotNull(message = "规则类型不能为空")
private Integer type; private Integer type;
@Schema(description = "规则值数组", required = true, example = "1,2,3") @Schema(description = "规则值数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")
@NotNull(message = "规则值数组不能为空") @NotNull(message = "规则值数组不能为空")
private Set<Long> options; private Set<Long> options;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -14,12 +13,12 @@ import javax.validation.constraints.NotEmpty;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmTaskAssignRuleCreateReqVO extends BpmTaskAssignRuleBaseVO { public class BpmTaskAssignRuleCreateReqVO extends BpmTaskAssignRuleBaseVO {
@Schema(description = "流程模型的编号", required = true, example = "1024") @Schema(description = "流程模型的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "流程模型的编号不能为空") @NotEmpty(message = "流程模型的编号不能为空")
private String modelId; private String modelId;
@Schema(description = "流程任务定义的编号", required = true, example = "2048") @Schema(description = "流程任务定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
@NotEmpty(message = "流程任务定义的编号不能为空") @NotEmpty(message = "流程任务定义的编号不能为空")
private String taskDefinitionKey; private String taskDefinitionKey;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -12,18 +11,18 @@ import lombok.ToString;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmTaskAssignRuleRespVO extends BpmTaskAssignRuleBaseVO { public class BpmTaskAssignRuleRespVO extends BpmTaskAssignRuleBaseVO {
@Schema(description = "任务分配规则的编号", required = true, example = "1024") @Schema(description = "任务分配规则的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "流程模型的编号", required = true, example = "2048") @Schema(description = "流程模型的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
private String modelId; private String modelId;
@Schema(description = "流程定义的编号", required = true, example = "4096") @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4096")
private String processDefinitionId; private String processDefinitionId;
@Schema(description = "流程任务定义的编号", required = true, example = "2048") @Schema(description = "流程任务定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
private String taskDefinitionKey; private String taskDefinitionKey;
@Schema(description = "流程任务定义的名字", required = true, example = "关注芋道") @Schema(description = "流程任务定义的名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "关注芋道")
private String taskDefinitionName; private String taskDefinitionName;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule; package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -14,8 +13,8 @@ import javax.validation.constraints.NotNull;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmTaskAssignRuleUpdateReqVO extends BpmTaskAssignRuleBaseVO { public class BpmTaskAssignRuleUpdateReqVO extends BpmTaskAssignRuleBaseVO {
@Schema(description = "任务分配规则的编号", required = true, example = "1024") @Schema(description = "任务分配规则的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "任务分配规则的编号不能为空") @NotNull(message = "任务分配规则的编号不能为空")
private Long id; private Long id;
} }

View File

@ -16,19 +16,19 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@Data @Data
public class BpmOALeaveBaseVO { public class BpmOALeaveBaseVO {
@Schema(description = "请假的开始时间", required = true) @Schema(description = "请假的开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "开始时间不能为空") @NotNull(message = "开始时间不能为空")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime startTime; private LocalDateTime startTime;
@Schema(description = "请假的结束时间", required = true) @Schema(description = "请假的结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "结束时间不能为空") @NotNull(message = "结束时间不能为空")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime endTime; private LocalDateTime endTime;
@Schema(description = "请假类型,参见 bpm_oa_type 枚举", required = true, example = "1") @Schema(description = "请假类型-参见 bpm_oa_type 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer type; private Integer type;
@Schema(description = "原因", required = true, example = "阅读芋道源码") @Schema(description = "原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "阅读芋道源码")
private String reason; private String reason;
} }

View File

@ -1,5 +1,4 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo; package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -18,5 +17,4 @@ public class BpmOALeaveCreateReqVO extends BpmOALeaveBaseVO {
return !getEndTime().isBefore(getStartTime()); return !getEndTime().isBefore(getStartTime());
} }
} }

View File

@ -1,11 +1,14 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo; package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 请假申请分页 Request VO") @Schema(description = "管理后台 - 请假申请分页 Request VO")
@ -14,17 +17,17 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmOALeavePageReqVO extends PageParam { public class BpmOALeavePageReqVO extends PageParam {
@Schema(description = "状态,参见 bpm_process_instance_result 枚举", example = "1") @Schema(description = "状态-参见 bpm_process_instance_result 枚举", example = "1")
private Integer result; private Integer result;
@Schema(description = "请假类型,参见 bpm_oa_type", example = "1") @Schema(description = "请假类型-参见 bpm_oa_type", example = "1")
private Integer type; private Integer type;
@Schema(description = "原因,模糊匹配", example = "阅读芋道源码") @Schema(description = "原因-模糊匹配", example = "阅读芋道源码")
private String reason; private String reason;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@Schema(description = "申请时间") @Schema(description = "申请时间")
private Date[] createTime; private LocalDateTime[] createTime;
} }

View File

@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo; package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -15,13 +17,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmOALeaveRespVO extends BpmOALeaveBaseVO { public class BpmOALeaveRespVO extends BpmOALeaveBaseVO {
@Schema(description = "请假表单主键", required = true, example = "1024") @Schema(description = "请假表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "状态,参见 bpm_process_instance_result 枚举", required = true, example = "1") @Schema(description = "状态-参见 bpm_process_instance_result 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer result; private Integer result;
@Schema(description = "申请时间", required = true) @Schema(description = "申请时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "申请时间不能为空") @NotNull(message = "申请时间不能为空")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime createTime; private LocalDateTime createTime;
@ -29,4 +31,4 @@ public class BpmOALeaveRespVO extends BpmOALeaveBaseVO {
@Schema(description = "流程id") @Schema(description = "流程id")
private String processInstanceId; private String processInstanceId;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -10,17 +9,17 @@ import java.time.LocalDateTime;
@Data @Data
public class BpmActivityRespVO { public class BpmActivityRespVO {
@Schema(description = "流程活动的标识", required = true, example = "1024") @Schema(description = "流程活动的标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String key; private String key;
@Schema(description = "流程活动的类型", required = true, example = "StartEvent") @Schema(description = "流程活动的类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartEvent")
private String type; private String type;
@Schema(description = "流程活动的开始时间", required = true) @Schema(description = "流程活动的开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime startTime; private LocalDateTime startTime;
@Schema(description = "流程活动的结束时间", required = true) @Schema(description = "流程活动的结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime endTime; private LocalDateTime endTime;
@Schema(description = "关联的流程任务的编号,关联的流程任务,只有 UserTask 等类型才有", example = "2048") @Schema(description = "关联的流程任务的编号-关联的流程任务,只有 UserTask 等类型才有", example = "2048")
private String taskId; private String taskId;
} }

View File

@ -1,23 +1,20 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Map;
@Schema(description = "管理后台 - 流程实例的取消 Request VO") @Schema(description = "管理后台 - 流程实例的取消 Request VO")
@Data @Data
public class BpmProcessInstanceCancelReqVO { public class BpmProcessInstanceCancelReqVO {
@Schema(description = "流程实例的编号", required = true, example = "1024") @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "流程实例的编号不能为空") @NotEmpty(message = "流程实例的编号不能为空")
private String id; private String id;
@Schema(description = "取消原因", required = true, example = "不请假了!") @Schema(description = "取消原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "不请假了!")
@NotEmpty(message = "取消原因不能为空") @NotEmpty(message = "取消原因不能为空")
private String reason; private String reason;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -11,11 +10,11 @@ import java.util.Map;
@Data @Data
public class BpmProcessInstanceCreateReqVO { public class BpmProcessInstanceCreateReqVO {
@Schema(description = "流程定义的编号", required = true, example = "1024") @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "流程定义编号不能为空") @NotEmpty(message = "流程定义编号不能为空")
private String processDefinitionId; private String processDefinitionId;
@Schema(description = "变量实例") @Schema(description = "变量实例")
private Map<String, Object> variables; private Map<String, Object> variables;
} }

View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@ -24,17 +23,17 @@ public class BpmProcessInstanceMyPageReqVO extends PageParam {
@Schema(description = "流程定义的编号", example = "2048") @Schema(description = "流程定义的编号", example = "2048")
private String processDefinitionId; private String processDefinitionId;
@Schema(description = "流程实例的状态,参见 bpm_process_instance_status", example = "1") @Schema(description = "流程实例的状态-参见 bpm_process_instance_status", example = "1")
private Integer status; private Integer status;
@Schema(description = "流程实例的结果,参见 bpm_process_instance_result", example = "2") @Schema(description = "流程实例的结果-参见 bpm_process_instance_result", example = "2")
private Integer result; private Integer result;
@Schema(description = "流程分类,参见 bpm_model_category 数据字典", example = "1") @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
private String category; private String category;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -11,28 +10,28 @@ import java.util.List;
@Data @Data
public class BpmProcessInstancePageItemRespVO { public class BpmProcessInstancePageItemRespVO {
@Schema(description = "流程实例的编号", required = true, example = "1024") @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "流程名称", required = true, example = "芋道") @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name; private String name;
@Schema(description = "流程定义的编号", required = true, example = "2048") @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
private String processDefinitionId; private String processDefinitionId;
@Schema(description = "流程分类,参见 bpm_model_category 数据字典", required = true, example = "1") @Schema(description = "流程分类-参见 bpm_model_category 数据字典", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private String category; private String category;
@Schema(description = "流程实例的状态,参见 bpm_process_instance_status", required = true, example = "1") @Schema(description = "流程实例的状态-参见 bpm_process_instance_status", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer status; private Integer status;
@Schema(description = "流程实例的结果,参见 bpm_process_instance_result", required = true, example = "2") @Schema(description = "流程实例的结果-参见 bpm_process_instance_result", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
private Integer result; private Integer result;
@Schema(description = "提交时间", required = true) @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
@Schema(description = "结束时间", required = true) @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime endTime; private LocalDateTime endTime;
/** /**
@ -44,12 +43,12 @@ public class BpmProcessInstancePageItemRespVO {
@Data @Data
public static class Task { public static class Task {
@Schema(description = "流程任务的编号", required = true, example = "1024") @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "任务名称", required = true, example = "芋道") @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name; private String name;
} }
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -12,31 +11,31 @@ import java.util.Map;
@Data @Data
public class BpmProcessInstanceRespVO { public class BpmProcessInstanceRespVO {
@Schema(description = "流程实例的编号", required = true, example = "1024") @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "流程名称", required = true, example = "芋道") @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name; private String name;
@Schema(description = "流程分类,参见 bpm_model_category 数据字典", required = true, example = "1") @Schema(description = "流程分类-参见 bpm_model_category 数据字典", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private String category; private String category;
@Schema(description = "流程实例的状态,参见 bpm_process_instance_status", required = true, example = "1") @Schema(description = "流程实例的状态-参见 bpm_process_instance_status", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer status; private Integer status;
@Schema(description = "流程实例的结果,参见 bpm_process_instance_result", required = true, example = "2") @Schema(description = "流程实例的结果-参见 bpm_process_instance_result", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
private Integer result; private Integer result;
@Schema(description = "提交时间", required = true) @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
@Schema(description = "结束时间", required = true) @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime endTime; private LocalDateTime endTime;
@Schema(description = "提交的表单值", required = true) @Schema(description = "提交的表单值", requiredMode = Schema.RequiredMode.REQUIRED)
private Map<String, Object> formVariables; private Map<String, Object> formVariables;
@Schema(description = "业务的唯一标识,例如说,请假申请的编号", example = "1") @Schema(description = "业务的唯一标识-例如说,请假申请的编号", example = "1")
private String businessKey; private String businessKey;
/** /**
@ -53,14 +52,14 @@ public class BpmProcessInstanceRespVO {
@Data @Data
public static class User { public static class User {
@Schema(description = "用户编号", required = true, example = "1") @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id; private Long id;
@Schema(description = "用户昵称", required = true, example = "芋艿") @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
private String nickname; private String nickname;
@Schema(description = "部门编号", required = true, example = "1") @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long deptId; private Long deptId;
@Schema(description = "部门名称", required = true, example = "研发部") @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
private String deptName; private String deptName;
} }
@ -69,25 +68,27 @@ public class BpmProcessInstanceRespVO {
@Data @Data
public static class ProcessDefinition { public static class ProcessDefinition {
@Schema(description = "编号", required = true, example = "1024") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "表单类型,参见 bpm_model_form_type 数据字典", example = "1") @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
private Integer formType; private Integer formType;
@Schema(description = "表单编号,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "1024") @Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "1024")
private Long formId; private Long formId;
@Schema(description = "表单的配置,JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", required = true) @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
private String formConf; private String formConf;
@Schema(description = "表单项的数组,JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", required = true) @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
private List<String> formFields; private List<String> formFields;
@Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "/bpm/oa/leave/create") @Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空",
example = "/bpm/oa/leave/create")
private String formCustomCreatePath; private String formCustomCreatePath;
@Schema(description = "自定义表单的查看路径,使用 Vue 的路由地址,在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "/bpm/oa/leave/view") @Schema(description = "自定义表单的查看路径,使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空",
example = "/bpm/oa/leave/view")
private String formCustomViewPath; private String formCustomViewPath;
@Schema(description = "BPMN XML", required = true) @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
private String bpmnXml; private String bpmnXml;
} }
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -10,12 +9,12 @@ import javax.validation.constraints.NotEmpty;
@Data @Data
public class BpmTaskApproveReqVO { public class BpmTaskApproveReqVO {
@Schema(description = "任务编号", required = true, example = "1024") @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "任务编号不能为空") @NotEmpty(message = "任务编号不能为空")
private String id; private String id;
@Schema(description = "审批意见", required = true, example = "不错不错!") @Schema(description = "审批意见", requiredMode = Schema.RequiredMode.REQUIRED, example = "不错不错!")
@NotEmpty(message = "审批意见不能为空") @NotEmpty(message = "审批意见不能为空")
private String reason; private String reason;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -14,14 +13,14 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmTaskDonePageItemRespVO extends BpmTaskTodoPageItemRespVO { public class BpmTaskDonePageItemRespVO extends BpmTaskTodoPageItemRespVO {
@Schema(description = "结束时间", required = true) @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime endTime; private LocalDateTime endTime;
@Schema(description = "持续时间", required = true, example = "1000") @Schema(description = "持续时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
private Long durationInMillis; private Long durationInMillis;
@Schema(description = "任务结果,参见 bpm_process_instance_result", required = true, example = "2") @Schema(description = "任务结果-参见 bpm_process_instance_result", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
private Integer result; private Integer result;
@Schema(description = "审批建议", required = true, example = "不请假了!") @Schema(description = "审批建议", requiredMode = Schema.RequiredMode.REQUIRED, example = "不请假了!")
private String reason; private String reason;
} }

View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@ -29,4 +28,4 @@ public class BpmTaskDonePageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime endCreateTime; private LocalDateTime endCreateTime;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -10,12 +9,12 @@ import javax.validation.constraints.NotEmpty;
@Data @Data
public class BpmTaskRejectReqVO { public class BpmTaskRejectReqVO {
@Schema(description = "任务编号", required = true, example = "1024") @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "任务编号不能为空") @NotEmpty(message = "任务编号不能为空")
private String id; private String id;
@Schema(description = "审批意见", required = true, example = "不错不错!") @Schema(description = "审批意见", requiredMode = Schema.RequiredMode.REQUIRED, example = "不错不错!")
@NotEmpty(message = "审批意见不能为空") @NotEmpty(message = "审批意见不能为空")
private String reason; private String reason;
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -12,7 +11,7 @@ import lombok.ToString;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BpmTaskRespVO extends BpmTaskDonePageItemRespVO { public class BpmTaskRespVO extends BpmTaskDonePageItemRespVO {
@Schema(description = "任务定义的标识", required = true, example = "user-001") @Schema(description = "任务定义的标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "user-001")
private String definitionKey; private String definitionKey;
/** /**
@ -24,15 +23,15 @@ public class BpmTaskRespVO extends BpmTaskDonePageItemRespVO {
@Data @Data
public static class User { public static class User {
@Schema(description = "用户编号", required = true, example = "1") @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id; private Long id;
@Schema(description = "用户昵称", required = true, example = "芋艿") @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
private String nickname; private String nickname;
@Schema(description = "部门编号", required = true, example = "1") @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long deptId; private Long deptId;
@Schema(description = "部门名称", required = true, example = "研发部") @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
private String deptName; private String deptName;
} }
} }

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -10,19 +9,19 @@ import java.time.LocalDateTime;
@Data @Data
public class BpmTaskTodoPageItemRespVO { public class BpmTaskTodoPageItemRespVO {
@Schema(description = "任务编号", required = true, example = "1024") @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "任务名字", required = true, example = "芋道") @Schema(description = "任务名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name; private String name;
@Schema(description = "接收时间", required = true) @Schema(description = "接收时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime claimTime; private LocalDateTime claimTime;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
@Schema(description = "激活状态,参见 SuspensionState 枚举", required = true, example = "1") @Schema(description = "激活状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer suspensionState; private Integer suspensionState;
/** /**
@ -34,21 +33,21 @@ public class BpmTaskTodoPageItemRespVO {
@Schema(description = "流程实例") @Schema(description = "流程实例")
public static class ProcessInstance { public static class ProcessInstance {
@Schema(description = "流程实例编号", required = true, example = "1024") @Schema(description = "流程实例编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id; private String id;
@Schema(description = "流程实例名称", required = true, example = "芋道") @Schema(description = "流程实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name; private String name;
@Schema(description = "发起人的用户编号", required = true, example = "1024") @Schema(description = "发起人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long startUserId; private Long startUserId;
@Schema(description = "发起人的用户昵称", required = true, example = "芋艿") @Schema(description = "发起人的用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
private String startUserNickname; private String startUserNickname;
@Schema(description = "流程定义的编号", required = true, example = "2048") @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
private String processDefinitionId; private String processDefinitionId;
} }
} }

View File

@ -10,8 +10,6 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 流程任务的 TODO 待办的分页 Request VO") @Schema(description = "管理后台 - 流程任务的 TODO 待办的分页 Request VO")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

View File

@ -1,11 +1,7 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import net.bytebuddy.implementation.bind.annotation.Empty;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -14,12 +10,12 @@ import javax.validation.constraints.NotNull;
@Data @Data
public class BpmTaskUpdateAssigneeReqVO { public class BpmTaskUpdateAssigneeReqVO {
@Schema(description = "任务编号", required = true, example = "1024") @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "任务编号不能为空") @NotEmpty(message = "任务编号不能为空")
private String id; private String id;
@Schema(description = "新审批人的用户编号", required = true, example = "2048") @Schema(description = "新审批人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
@NotNull(message = "新审批人的用户编号不能为空") @NotNull(message = "新审批人的用户编号不能为空")
private Long assigneeUserId; private Long assigneeUserId;
} }

View File

@ -17,12 +17,9 @@ import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance; import org.flowable.task.api.history.HistoricTaskInstance;
import org.mapstruct.*; import org.mapstruct.*;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
import org.springframework.beans.BeanUtils;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* Bpm Convert * Bpm Convert
@ -34,37 +31,9 @@ public interface BpmTaskConvert {
BpmTaskConvert INSTANCE = Mappers.getMapper(BpmTaskConvert.class); BpmTaskConvert INSTANCE = Mappers.getMapper(BpmTaskConvert.class);
/**
*
*
* @param source
* @param target
* @param <T>
*
* @return
*/
public static <T> T copy(Object source, Class<T> target) {
if (source == null || target == null) {
return null;
}
try {
T newInstance = target.newInstance();
BeanUtils.copyProperties(source, newInstance);
return newInstance;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
default <T, K> List<K> copyList(List<T> source, Class<K> target) {
if (null == source || source.isEmpty()) {
return Collections.emptyList();
}
return source.stream().map(e -> copy(e, target)).collect(Collectors.toList());
}
default List<BpmTaskTodoPageItemRespVO> convertList1(List<Task> tasks, default List<BpmTaskTodoPageItemRespVO> convertList1(List<Task> tasks,
Map<String, ProcessInstance> processInstanceMap, Map<Long, AdminUserRespDTO> userMap) { Map<String, ProcessInstance> processInstanceMap,
Map<Long, AdminUserRespDTO> userMap) {
return CollectionUtils.convertList(tasks, task -> { return CollectionUtils.convertList(tasks, task -> {
BpmTaskTodoPageItemRespVO respVO = convert1(task); BpmTaskTodoPageItemRespVO respVO = convert1(task);
ProcessInstance processInstance = processInstanceMap.get(task.getProcessInstanceId()); ProcessInstance processInstance = processInstanceMap.get(task.getProcessInstanceId());

View File

@ -11,12 +11,12 @@ import java.util.List;
@Data @Data
public class CodegenCreateListReqVO { public class CodegenCreateListReqVO {
@Schema(description = "数据源配置的编号", required = true, example = "1") @Schema(description = "数据源配置的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "数据源配置的编号不能为空") @NotNull(message = "数据源配置的编号不能为空")
private Long dataSourceConfigId; private Long dataSourceConfigId;
@Schema(description = "表名数组", required = true, example = "[1, 2, 3]") @Schema(description = "表名数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1, 2, 3]")
@NotNull(message = "表名数组不能为空") @NotNull(message = "表名数组不能为空")
private List<String> tableNames; private List<String> tableNames;
} }

View File

@ -8,10 +8,10 @@ import lombok.Data;
@Data @Data
public class CodegenPreviewRespVO { public class CodegenPreviewRespVO {
@Schema(description = "文件路径", required = true, example = "java/cn/iocoder/yudao/adminserver/modules/system/controller/test/SysTestDemoController.java") @Schema(description = "文件路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "java/cn/iocoder/yudao/adminserver/modules/system/controller/test/SysTestDemoController.java")
private String filePath; private String filePath;
@Schema(description = "代码", required = true, example = "Hello World") @Schema(description = "代码", requiredMode = Schema.RequiredMode.REQUIRED, example = "Hello World")
private String code; private String code;
} }

View File

@ -34,7 +34,7 @@ public class CodegenUpdateReqVO {
@Valid @Valid
public static class Table extends CodegenTableBaseVO { public static class Table extends CodegenTableBaseVO {
@Schema(description = "编号", required = true, example = "1") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id; private Long id;
@AssertTrue(message = "上级菜单不能为空,请前往 [修改生成配置 -> 生成信息] 界面,设置“上级菜单”字段") @AssertTrue(message = "上级菜单不能为空,请前往 [修改生成配置 -> 生成信息] 界面,设置“上级菜单”字段")
@ -52,7 +52,7 @@ public class CodegenUpdateReqVO {
@ToString(callSuper = true) @ToString(callSuper = true)
public static class Column extends CodegenColumnBaseVO { public static class Column extends CodegenColumnBaseVO {
@Schema(description = "编号", required = true, example = "1") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id; private Long id;
} }

View File

@ -12,43 +12,43 @@ import javax.validation.constraints.NotNull;
@Data @Data
public class CodegenColumnBaseVO { public class CodegenColumnBaseVO {
@Schema(description = "表编号", required = true, example = "1") @Schema(description = "表编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "表编号不能为空") @NotNull(message = "表编号不能为空")
private Long tableId; private Long tableId;
@Schema(description = "字段名", required = true, example = "user_age") @Schema(description = "字段名", requiredMode = Schema.RequiredMode.REQUIRED, example = "user_age")
@NotNull(message = "字段名不能为空") @NotNull(message = "字段名不能为空")
private String columnName; private String columnName;
@Schema(description = "字段类型", required = true, example = "int(11)") @Schema(description = "字段类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "int(11)")
@NotNull(message = "字段类型不能为空") @NotNull(message = "字段类型不能为空")
private String dataType; private String dataType;
@Schema(description = "字段描述", required = true, example = "年龄") @Schema(description = "字段描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "年龄")
@NotNull(message = "字段描述不能为空") @NotNull(message = "字段描述不能为空")
private String columnComment; private String columnComment;
@Schema(description = "是否允许为空", required = true, example = "true") @Schema(description = "是否允许为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否允许为空不能为空") @NotNull(message = "是否允许为空不能为空")
private Boolean nullable; private Boolean nullable;
@Schema(description = "是否主键", required = true, example = "false") @Schema(description = "是否主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
@NotNull(message = "是否主键不能为空") @NotNull(message = "是否主键不能为空")
private Boolean primaryKey; private Boolean primaryKey;
@Schema(description = "是否自增", required = true, example = "true") @Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否自增不能为空") @NotNull(message = "是否自增不能为空")
private String autoIncrement; private String autoIncrement;
@Schema(description = "排序", required = true, example = "10") @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@NotNull(message = "排序不能为空") @NotNull(message = "排序不能为空")
private Integer ordinalPosition; private Integer ordinalPosition;
@Schema(description = "Java 属性类型", required = true, example = "userAge") @Schema(description = "Java 属性类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "userAge")
@NotNull(message = "Java 属性类型不能为空") @NotNull(message = "Java 属性类型不能为空")
private String javaType; private String javaType;
@Schema(description = "Java 属性名", required = true, example = "Integer") @Schema(description = "Java 属性名", requiredMode = Schema.RequiredMode.REQUIRED, example = "Integer")
@NotNull(message = "Java 属性名不能为空") @NotNull(message = "Java 属性名不能为空")
private String javaField; private String javaField;
@ -58,28 +58,28 @@ public class CodegenColumnBaseVO {
@Schema(description = "数据示例", example = "1024") @Schema(description = "数据示例", example = "1024")
private String example; private String example;
@Schema(description = "是否为 Create 创建操作的字段", required = true, example = "true") @Schema(description = "是否为 Create 创建操作的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否为 Create 创建操作的字段不能为空") @NotNull(message = "是否为 Create 创建操作的字段不能为空")
private Boolean createOperation; private Boolean createOperation;
@Schema(description = "是否为 Update 更新操作的字段", required = true, example = "false") @Schema(description = "是否为 Update 更新操作的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
@NotNull(message = "是否为 Update 更新操作的字段不能为空") @NotNull(message = "是否为 Update 更新操作的字段不能为空")
private Boolean updateOperation; private Boolean updateOperation;
@Schema(description = "是否为 List 查询操作的字段", required = true, example = "true") @Schema(description = "是否为 List 查询操作的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否为 List 查询操作的字段不能为空") @NotNull(message = "是否为 List 查询操作的字段不能为空")
private Boolean listOperation; private Boolean listOperation;
@Schema(description = "List 查询操作的条件类型,参见 CodegenColumnListConditionEnum 枚举", required = true, example = "LIKE") @Schema(description = "List 查询操作的条件类型,参见 CodegenColumnListConditionEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "LIKE")
@NotNull(message = "List 查询操作的条件类型不能为空") @NotNull(message = "List 查询操作的条件类型不能为空")
private String listOperationCondition; private String listOperationCondition;
@Schema(description = "是否为 List 查询操作的返回字段", required = true, example = "true") @Schema(description = "是否为 List 查询操作的返回字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否为 List 查询操作的返回字段不能为空") @NotNull(message = "是否为 List 查询操作的返回字段不能为空")
private Boolean listOperationResult; private Boolean listOperationResult;
@Schema(description = "显示类型", required = true, example = "input") @Schema(description = "显示类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "input")
@NotNull(message = "显示类型不能为空") @NotNull(message = "显示类型不能为空")
private String htmlType; private String htmlType;
} }

View File

@ -14,10 +14,10 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class CodegenColumnRespVO extends CodegenColumnBaseVO { public class CodegenColumnRespVO extends CodegenColumnBaseVO {
@Schema(description = "编号", required = true, example = "1") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id; private Long id;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -12,46 +12,46 @@ import javax.validation.constraints.NotNull;
@Data @Data
public class CodegenTableBaseVO { public class CodegenTableBaseVO {
@Schema(description = "生成场景,参见 CodegenSceneEnum 枚举", required = true, example = "1") @Schema(description = "生成场景,参见 CodegenSceneEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "导入类型不能为空") @NotNull(message = "导入类型不能为空")
private Integer scene; private Integer scene;
@Schema(description = "表名称", required = true, example = "yudao") @Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao")
@NotNull(message = "表名称不能为空") @NotNull(message = "表名称不能为空")
private String tableName; private String tableName;
@Schema(description = "表描述", required = true, example = "芋道") @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@NotNull(message = "表描述不能为空") @NotNull(message = "表描述不能为空")
private String tableComment; private String tableComment;
@Schema(description = "备注", example = "我是备注") @Schema(description = "备注", example = "我是备注")
private String remark; private String remark;
@Schema(description = "模块名", required = true, example = "system") @Schema(description = "模块名", requiredMode = Schema.RequiredMode.REQUIRED, example = "system")
@NotNull(message = "模块名不能为空") @NotNull(message = "模块名不能为空")
private String moduleName; private String moduleName;
@Schema(description = "业务名", required = true, example = "codegen") @Schema(description = "业务名", requiredMode = Schema.RequiredMode.REQUIRED, example = "codegen")
@NotNull(message = "业务名不能为空") @NotNull(message = "业务名不能为空")
private String businessName; private String businessName;
@Schema(description = "类名称", required = true, example = "CodegenTable") @Schema(description = "类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "CodegenTable")
@NotNull(message = "类名称不能为空") @NotNull(message = "类名称不能为空")
private String className; private String className;
@Schema(description = "类描述", required = true, example = "代码生成器的表定义") @Schema(description = "类描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "代码生成器的表定义")
@NotNull(message = "类描述不能为空") @NotNull(message = "类描述不能为空")
private String classComment; private String classComment;
@Schema(description = "作者", required = true, example = "芋道源码") @Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
@NotNull(message = "作者不能为空") @NotNull(message = "作者不能为空")
private String author; private String author;
@Schema(description = "模板类型,参见 CodegenTemplateTypeEnum 枚举", required = true, example = "1") @Schema(description = "模板类型,参见 CodegenTemplateTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "模板类型不能为空") @NotNull(message = "模板类型不能为空")
private Integer templateType; private Integer templateType;
@Schema(description = "前端类型,参见 CodegenFrontTypeEnum 枚举", required = true, example = "20") @Schema(description = "前端类型,参见 CodegenFrontTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
@NotNull(message = "前端类型不能为空") @NotNull(message = "前端类型不能为空")
private Integer frontType; private Integer frontType;

View File

@ -14,16 +14,16 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class CodegenTableRespVO extends CodegenTableBaseVO { public class CodegenTableRespVO extends CodegenTableBaseVO {
@Schema(description = "编号", required = true, example = "1") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id; private Long id;
@Schema(description = "主键编号", required = true, example = "1024") @Schema(description = "主键编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer dataSourceConfigId; private Integer dataSourceConfigId;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
@Schema(description = "更新时间", required = true) @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }

View File

@ -8,10 +8,10 @@ import lombok.Data;
@Data @Data
public class DatabaseTableRespVO { public class DatabaseTableRespVO {
@Schema(description = "表名称", required = true, example = "yuanma") @Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "yuanma")
private String name; private String name;
@Schema(description = "表描述", required = true, example = "芋道源码") @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
private String comment; private String comment;
} }

View File

@ -15,22 +15,22 @@ import javax.validation.constraints.Size;
@Data @Data
public class ConfigBaseVO { public class ConfigBaseVO {
@Schema(description = "参数分组", required = true, example = "biz") @Schema(description = "参数分组", requiredMode = Schema.RequiredMode.REQUIRED, example = "biz")
@NotEmpty(message = "参数分组不能为空") @NotEmpty(message = "参数分组不能为空")
@Size(max = 50, message = "参数名称不能超过50个字符") @Size(max = 50, message = "参数名称不能超过50个字符")
private String category; private String category;
@Schema(description = "参数名称", required = true, example = "数据库名") @Schema(description = "参数名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "数据库名")
@NotBlank(message = "参数名称不能为空") @NotBlank(message = "参数名称不能为空")
@Size(max = 100, message = "参数名称不能超过100个字符") @Size(max = 100, message = "参数名称不能超过100个字符")
private String name; private String name;
@Schema(description = "参数键值", required = true, example = "1024") @Schema(description = "参数键值", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotBlank(message = "参数键值不能为空") @NotBlank(message = "参数键值不能为空")
@Size(max = 500, message = "参数键值长度不能超过500个字符") @Size(max = 500, message = "参数键值长度不能超过500个字符")
private String value; private String value;
@Schema(description = "是否可见", required = true, example = "true") @Schema(description = "是否可见", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否可见不能为空") @NotNull(message = "是否可见不能为空")
private Boolean visible; private Boolean visible;

View File

@ -13,9 +13,9 @@ import javax.validation.constraints.Size;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class ConfigCreateReqVO extends ConfigBaseVO { public class ConfigCreateReqVO extends ConfigBaseVO {
@Schema(description = "参数键名", required = true, example = "yunai.db.username") @Schema(description = "参数键名", requiredMode = Schema.RequiredMode.REQUIRED, example = "yunai.db.username")
@NotBlank(message = "参数键名长度不能为空") @NotBlank(message = "参数键名长度不能为空")
@Size(max = 100, message = "参数键名长度不能超过100个字符") @Size(max = 100, message = "参数键名长度不能超过100个字符")
private String key; private String key;
} }

View File

@ -14,18 +14,18 @@ import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class ConfigRespVO extends ConfigBaseVO { public class ConfigRespVO extends ConfigBaseVO {
@Schema(description = "参数配置序号", required = true, example = "1024") @Schema(description = "参数配置序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "参数键名", required = true, example = "yunai.db.username") @Schema(description = "参数键名", requiredMode = Schema.RequiredMode.REQUIRED, example = "yunai.db.username")
@NotBlank(message = "参数键名长度不能为空") @NotBlank(message = "参数键名长度不能为空")
@Size(max = 100, message = "参数键名长度不能超过100个字符") @Size(max = 100, message = "参数键名长度不能超过100个字符")
private String key; private String key;
@Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", required = true, example = "1") @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer type; private Integer type;
@Schema(description = "创建时间", required = true, example = "时间戳格式") @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -14,8 +14,8 @@ import javax.validation.constraints.NotNull;
@ToString(callSuper = true) @ToString(callSuper = true)
public class ConfigUpdateReqVO extends ConfigBaseVO { public class ConfigUpdateReqVO extends ConfigBaseVO {
@Schema(description = "参数配置序号", required = true, example = "1024") @Schema(description = "参数配置序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "参数配置编号不能为空") @NotNull(message = "参数配置编号不能为空")
private Long id; private Long id;
} }

View File

@ -11,16 +11,16 @@ import javax.validation.constraints.*;
@Data @Data
public class DataSourceConfigBaseVO { public class DataSourceConfigBaseVO {
@Schema(description = "数据源名称", required = true, example = "test") @Schema(description = "数据源名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "test")
@NotNull(message = "数据源名称不能为空") @NotNull(message = "数据源名称不能为空")
private String name; private String name;
@Schema(description = "数据源连接", required = true, example = "jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro") @Schema(description = "数据源连接", requiredMode = Schema.RequiredMode.REQUIRED, example = "jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro")
@NotNull(message = "数据源连接不能为空") @NotNull(message = "数据源连接不能为空")
private String url; private String url;
@Schema(description = "用户名", required = true, example = "root") @Schema(description = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "root")
@NotNull(message = "用户名不能为空") @NotNull(message = "用户名不能为空")
private String username; private String username;
} }

View File

@ -10,8 +10,8 @@ import javax.validation.constraints.*;
@ToString(callSuper = true) @ToString(callSuper = true)
public class DataSourceConfigCreateReqVO extends DataSourceConfigBaseVO { public class DataSourceConfigCreateReqVO extends DataSourceConfigBaseVO {
@Schema(description = "密码", required = true, example = "123456") @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
@NotNull(message = "密码不能为空") @NotNull(message = "密码不能为空")
private String password; private String password;
} }

View File

@ -11,10 +11,10 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class DataSourceConfigRespVO extends DataSourceConfigBaseVO { public class DataSourceConfigRespVO extends DataSourceConfigBaseVO {
@Schema(description = "主键编号", required = true, example = "1024") @Schema(description = "主键编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer id; private Integer id;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -10,12 +10,12 @@ import javax.validation.constraints.*;
@ToString(callSuper = true) @ToString(callSuper = true)
public class DataSourceConfigUpdateReqVO extends DataSourceConfigBaseVO { public class DataSourceConfigUpdateReqVO extends DataSourceConfigBaseVO {
@Schema(description = "主键编号", required = true, example = "1024") @Schema(description = "主键编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "主键编号不能为空") @NotNull(message = "主键编号不能为空")
private Long id; private Long id;
@Schema(description = "密码", required = true, example = "123456") @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
@NotNull(message = "密码不能为空") @NotNull(message = "密码不能为空")
private String password; private String password;
} }

View File

@ -12,11 +12,11 @@ import javax.validation.constraints.NotNull;
@Data @Data
public class FileConfigBaseVO { public class FileConfigBaseVO {
@Schema(description = "配置名", required = true, example = "S3 - 阿里云") @Schema(description = "配置名", requiredMode = Schema.RequiredMode.REQUIRED, example = "S3 - 阿里云")
@NotNull(message = "配置名不能为空") @NotNull(message = "配置名不能为空")
private String name; private String name;
@Schema(description = "备注", example = "我是备注") @Schema(description = "备注", example = "我是备注")
private String remark; private String remark;
} }

View File

@ -15,12 +15,12 @@ import java.util.Map;
@ToString(callSuper = true) @ToString(callSuper = true)
public class FileConfigCreateReqVO extends FileConfigBaseVO { public class FileConfigCreateReqVO extends FileConfigBaseVO {
@Schema(description = "存储器,参见 FileStorageEnum 枚举类", required = true, example = "1") @Schema(description = "存储器,参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "存储器不能为空") @NotNull(message = "存储器不能为空")
private Integer storage; private Integer storage;
@Schema(description = "存储配置,配置是动态参数,所以使用 Map 接收", required = true) @Schema(description = "存储配置,配置是动态参数,所以使用 Map 接收", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "存储配置不能为空") @NotNull(message = "存储配置不能为空")
private Map<String, Object> config; private Map<String, Object> config;
} }

View File

@ -16,21 +16,21 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class FileConfigRespVO extends FileConfigBaseVO { public class FileConfigRespVO extends FileConfigBaseVO {
@Schema(description = "编号", required = true, example = "1") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id; private Long id;
@Schema(description = "存储器,参见 FileStorageEnum 枚举类", required = true, example = "1") @Schema(description = "存储器,参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "存储器不能为空") @NotNull(message = "存储器不能为空")
private Integer storage; private Integer storage;
@Schema(description = "是否为主配置", required = true, example = "true") @Schema(description = "是否为主配置", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否为主配置不能为空") @NotNull(message = "是否为主配置不能为空")
private Boolean master; private Boolean master;
@Schema(description = "存储配置", required = true) @Schema(description = "存储配置", requiredMode = Schema.RequiredMode.REQUIRED)
private FileClientConfig config; private FileClientConfig config;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -15,12 +15,12 @@ import java.util.Map;
@ToString(callSuper = true) @ToString(callSuper = true)
public class FileConfigUpdateReqVO extends FileConfigBaseVO { public class FileConfigUpdateReqVO extends FileConfigBaseVO {
@Schema(description = "编号", required = true, example = "1") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "编号不能为空") @NotNull(message = "编号不能为空")
private Long id; private Long id;
@Schema(description = "存储配置,配置是动态参数,所以使用 Map 接收", required = true) @Schema(description = "存储配置,配置是动态参数,所以使用 Map 接收", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "存储配置不能为空") @NotNull(message = "存储配置不能为空")
private Map<String, Object> config; private Map<String, Object> config;
} }

View File

@ -10,22 +10,22 @@ import java.time.LocalDateTime;
@Data @Data
public class FileRespVO { public class FileRespVO {
@Schema(description = "文件编号", required = true, example = "1024") @Schema(description = "文件编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "文件路径", required = true, example = "yudao.jpg") @Schema(description = "文件路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao.jpg")
private String path; private String path;
@Schema(description = "文件 URL", required = true, example = "https://www.iocoder.cn/yudao.jpg") @Schema(description = "文件 URL", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/yudao.jpg")
private String url; private String url;
@Schema(description = "文件类型", example = "jpg") @Schema(description = "文件类型", example = "jpg")
private String type; private String type;
@Schema(description = "文件大小", example = "2048", required = true) @Schema(description = "文件大小", example = "2048", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer size; private Integer size;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -11,11 +11,11 @@ import javax.validation.constraints.NotNull;
@Data @Data
public class FileUploadReqVO { public class FileUploadReqVO {
@Schema(description = "文件附件", required = true) @Schema(description = "文件附件", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "文件附件不能为空") @NotNull(message = "文件附件不能为空")
private MultipartFile file; private MultipartFile file;
@Schema(description = "文件附件", example = "yudaoyuanma.png") @Schema(description = "文件附件", example = "yudaoyuanma.png")
private String path; private String path;
} }

View File

@ -16,60 +16,60 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@Data @Data
public class ApiAccessLogBaseVO { public class ApiAccessLogBaseVO {
@Schema(description = "链路追踪编号", required = true, example = "66600cb6-7852-11eb-9439-0242ac130002") @Schema(description = "链路追踪编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "66600cb6-7852-11eb-9439-0242ac130002")
@NotNull(message = "链路追踪编号不能为空") @NotNull(message = "链路追踪编号不能为空")
private String traceId; private String traceId;
@Schema(description = "用户编号", required = true, example = "666") @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
@NotNull(message = "用户编号不能为空") @NotNull(message = "用户编号不能为空")
private Long userId; private Long userId;
@Schema(description = "用户类型,参见 UserTypeEnum 枚举", required = true, example = "2") @Schema(description = "用户类型,参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotNull(message = "用户类型不能为空") @NotNull(message = "用户类型不能为空")
private Integer userType; private Integer userType;
@Schema(description = "应用名", required = true, example = "dashboard") @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "dashboard")
@NotNull(message = "应用名不能为空") @NotNull(message = "应用名不能为空")
private String applicationName; private String applicationName;
@Schema(description = "请求方法名", required = true, example = "GET") @Schema(description = "请求方法名", requiredMode = Schema.RequiredMode.REQUIRED, example = "GET")
@NotNull(message = "请求方法名不能为空") @NotNull(message = "请求方法名不能为空")
private String requestMethod; private String requestMethod;
@Schema(description = "请求地址", required = true, example = "/xxx/yyy") @Schema(description = "请求地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "/xxx/yyy")
@NotNull(message = "请求地址不能为空") @NotNull(message = "请求地址不能为空")
private String requestUrl; private String requestUrl;
@Schema(description = "请求参数") @Schema(description = "请求参数")
private String requestParams; private String requestParams;
@Schema(description = "用户 IP", required = true, example = "127.0.0.1") @Schema(description = "用户 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1")
@NotNull(message = "用户 IP不能为空") @NotNull(message = "用户 IP不能为空")
private String userIp; private String userIp;
@Schema(description = "浏览器 UA", required = true, example = "Mozilla/5.0") @Schema(description = "浏览器 UA", requiredMode = Schema.RequiredMode.REQUIRED, example = "Mozilla/5.0")
@NotNull(message = "浏览器 UA不能为空") @NotNull(message = "浏览器 UA不能为空")
private String userAgent; private String userAgent;
@Schema(description = "开始请求时间", required = true) @Schema(description = "开始请求时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "开始请求时间不能为空") @NotNull(message = "开始请求时间不能为空")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime beginTime; private LocalDateTime beginTime;
@Schema(description = "结束请求时间", required = true) @Schema(description = "结束请求时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "结束请求时间不能为空") @NotNull(message = "结束请求时间不能为空")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime endTime; private LocalDateTime endTime;
@Schema(description = "执行时长", required = true, example = "100") @Schema(description = "执行时长", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
@NotNull(message = "执行时长不能为空") @NotNull(message = "执行时长不能为空")
private Integer duration; private Integer duration;
@Schema(description = "结果码", required = true, example = "0") @Schema(description = "结果码", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
@NotNull(message = "结果码不能为空") @NotNull(message = "结果码不能为空")
private Integer resultCode; private Integer resultCode;
@Schema(description = "结果提示", example = "芋道源码,牛逼!") @Schema(description = "结果提示", example = "芋道源码,牛逼!")
private String resultMsg; private String resultMsg;
} }

View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@ -40,4 +39,4 @@ public class ApiAccessLogPageReqVO extends PageParam {
@Schema(description = "结果码", example = "0") @Schema(description = "结果码", example = "0")
private Integer resultCode; private Integer resultCode;
} }

View File

@ -14,10 +14,10 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class ApiAccessLogRespVO extends ApiAccessLogBaseVO { public class ApiAccessLogRespVO extends ApiAccessLogBaseVO {
@Schema(description = "日志主键", required = true, example = "1024") @Schema(description = "日志主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -16,81 +16,81 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@Data @Data
public class ApiErrorLogBaseVO { public class ApiErrorLogBaseVO {
@Schema(description = "链路追踪编号", required = true, example = "66600cb6-7852-11eb-9439-0242ac130002") @Schema(description = "链路追踪编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "66600cb6-7852-11eb-9439-0242ac130002")
@NotNull(message = "链路追踪编号不能为空") @NotNull(message = "链路追踪编号不能为空")
private String traceId; private String traceId;
@Schema(description = "用户编号", required = true, example = "666") @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
@NotNull(message = "用户编号不能为空") @NotNull(message = "用户编号不能为空")
private Integer userId; private Integer userId;
@Schema(description = "用户类型", required = true, example = "1") @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "用户类型不能为空") @NotNull(message = "用户类型不能为空")
private Integer userType; private Integer userType;
@Schema(description = "应用名", required = true, example = "dashboard") @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "dashboard")
@NotNull(message = "应用名不能为空") @NotNull(message = "应用名不能为空")
private String applicationName; private String applicationName;
@Schema(description = "请求方法名", required = true, example = "GET") @Schema(description = "请求方法名", requiredMode = Schema.RequiredMode.REQUIRED, example = "GET")
@NotNull(message = "请求方法名不能为空") @NotNull(message = "请求方法名不能为空")
private String requestMethod; private String requestMethod;
@Schema(description = "请求地址", required = true, example = "/xx/yy") @Schema(description = "请求地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "/xx/yy")
@NotNull(message = "请求地址不能为空") @NotNull(message = "请求地址不能为空")
private String requestUrl; private String requestUrl;
@Schema(description = "请求参数", required = true) @Schema(description = "请求参数", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "请求参数不能为空") @NotNull(message = "请求参数不能为空")
private String requestParams; private String requestParams;
@Schema(description = "用户 IP", required = true, example = "127.0.0.1") @Schema(description = "用户 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1")
@NotNull(message = "用户 IP不能为空") @NotNull(message = "用户 IP不能为空")
private String userIp; private String userIp;
@Schema(description = "浏览器 UA", required = true, example = "Mozilla/5.0") @Schema(description = "浏览器 UA", requiredMode = Schema.RequiredMode.REQUIRED, example = "Mozilla/5.0")
@NotNull(message = "浏览器 UA不能为空") @NotNull(message = "浏览器 UA不能为空")
private String userAgent; private String userAgent;
@Schema(description = "异常发生时间", required = true) @Schema(description = "异常发生时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "异常发生时间不能为空") @NotNull(message = "异常发生时间不能为空")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime exceptionTime; private LocalDateTime exceptionTime;
@Schema(description = "异常名", required = true) @Schema(description = "异常名", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "异常名不能为空") @NotNull(message = "异常名不能为空")
private String exceptionName; private String exceptionName;
@Schema(description = "异常导致的消息", required = true) @Schema(description = "异常导致的消息", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "异常导致的消息不能为空") @NotNull(message = "异常导致的消息不能为空")
private String exceptionMessage; private String exceptionMessage;
@Schema(description = "异常导致的根消息", required = true) @Schema(description = "异常导致的根消息", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "异常导致的根消息不能为空") @NotNull(message = "异常导致的根消息不能为空")
private String exceptionRootCauseMessage; private String exceptionRootCauseMessage;
@Schema(description = "异常的栈轨迹", required = true) @Schema(description = "异常的栈轨迹", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "异常的栈轨迹不能为空") @NotNull(message = "异常的栈轨迹不能为空")
private String exceptionStackTrace; private String exceptionStackTrace;
@Schema(description = "异常发生的类全名", required = true) @Schema(description = "异常发生的类全名", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "异常发生的类全名不能为空") @NotNull(message = "异常发生的类全名不能为空")
private String exceptionClassName; private String exceptionClassName;
@Schema(description = "异常发生的类文件", required = true) @Schema(description = "异常发生的类文件", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "异常发生的类文件不能为空") @NotNull(message = "异常发生的类文件不能为空")
private String exceptionFileName; private String exceptionFileName;
@Schema(description = "异常发生的方法名", required = true) @Schema(description = "异常发生的方法名", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "异常发生的方法名不能为空") @NotNull(message = "异常发生的方法名不能为空")
private String exceptionMethodName; private String exceptionMethodName;
@Schema(description = "异常发生的方法所在行", required = true) @Schema(description = "异常发生的方法所在行", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "异常发生的方法所在行不能为空") @NotNull(message = "异常发生的方法所在行不能为空")
private Integer exceptionLineNumber; private Integer exceptionLineNumber;
@Schema(description = "处理状态", required = true, example = "0") @Schema(description = "处理状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
@NotNull(message = "处理状态不能为空") @NotNull(message = "处理状态不能为空")
private Integer processStatus; private Integer processStatus;
} }

View File

@ -14,16 +14,16 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class ApiErrorLogRespVO extends ApiErrorLogBaseVO { public class ApiErrorLogRespVO extends ApiErrorLogBaseVO {
@Schema(description = "编号", required = true, example = "1024") @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer id; private Integer id;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
@Schema(description = "处理时间", required = true) @Schema(description = "处理时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime processTime; private LocalDateTime processTime;
@Schema(description = "处理用户编号", example = "233") @Schema(description = "处理用户编号", example = "233")
private Integer processUserId; private Integer processUserId;
} }

View File

@ -15,22 +15,22 @@ import java.time.Duration;
@AllArgsConstructor @AllArgsConstructor
public class RedisKeyDefineRespVO { public class RedisKeyDefineRespVO {
@Schema(description = "Key 模板", required = true, example = "login_user:%s") @Schema(description = "Key 模板", requiredMode = Schema.RequiredMode.REQUIRED, example = "login_user:%s")
private String keyTemplate; private String keyTemplate;
@Schema(description = "Key 类型的枚举", required = true, example = "String") @Schema(description = "Key 类型的枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
private RedisKeyDefine.KeyTypeEnum keyType; private RedisKeyDefine.KeyTypeEnum keyType;
@Schema(description = "Value 类型", required = true, example = "java.lang.String") @Schema(description = "Value 类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "java.lang.String")
private Class<?> valueType; private Class<?> valueType;
@Schema(description = "超时类型", required = true, example = "1") @Schema(description = "超时类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private RedisKeyDefine.TimeoutTypeEnum timeoutType; private RedisKeyDefine.TimeoutTypeEnum timeoutType;
@Schema(description = "过期时间,单位:毫秒", required = true, example = "1024") @Schema(description = "过期时间,单位:毫秒", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Duration timeout; private Duration timeout;
@Schema(description = "备注", required = true, example = "啦啦啦啦~") @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "啦啦啦啦~")
private String memo; private String memo;
} }

View File

@ -15,22 +15,22 @@ import java.time.Duration;
@AllArgsConstructor @AllArgsConstructor
public class RedisKeyRespVO { public class RedisKeyRespVO {
@Schema(description = "login_user:%s", required = true, example = "String") @Schema(description = "login_user:%s", requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
private String keyTemplate; private String keyTemplate;
@Schema(description = "Key 类型的枚举", required = true, example = "String") @Schema(description = "Key 类型的枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
private RedisKeyDefine.KeyTypeEnum keyType; private RedisKeyDefine.KeyTypeEnum keyType;
@Schema(description = "Value 类型", required = true, example = "java.lang.String") @Schema(description = "Value 类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "java.lang.String")
private Class<?> valueType; private Class<?> valueType;
@Schema(description = "超时类型", required = true, example = "1") @Schema(description = "超时类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private RedisKeyDefine.TimeoutTypeEnum timeoutType; private RedisKeyDefine.TimeoutTypeEnum timeoutType;
@Schema(description = "过期时间,单位:毫秒", required = true, example = "1024") @Schema(description = "过期时间,单位:毫秒", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Duration timeout; private Duration timeout;
@Schema(description = "备注", required = true, example = "啦啦啦啦~") @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "啦啦啦啦~")
private String memo; private String memo;
} }

View File

@ -10,10 +10,10 @@ import lombok.Data;
@AllArgsConstructor @AllArgsConstructor
public class RedisKeyValueRespVO { public class RedisKeyValueRespVO {
@Schema(description = "c5f6990767804a928f4bb96ca249febf", required = true, example = "String") @Schema(description = "c5f6990767804a928f4bb96ca249febf", requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
private String key; private String key;
@Schema(required = true, example = "String") @Schema(requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
private String value; private String value;
} }

View File

@ -15,13 +15,13 @@ import java.util.Properties;
@AllArgsConstructor @AllArgsConstructor
public class RedisMonitorRespVO { public class RedisMonitorRespVO {
@Schema(description = "Redis info 指令结果,具体字段,查看 Redis 文档", required = true) @Schema(description = "Redis info 指令结果,具体字段,查看 Redis 文档", requiredMode = Schema.RequiredMode.REQUIRED)
private Properties info; private Properties info;
@Schema(description = "Redis key 数量", required = true, example = "1024") @Schema(description = "Redis key 数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long dbSize; private Long dbSize;
@Schema(description = "CommandStat 数组", required = true) @Schema(description = "CommandStat 数组", requiredMode = Schema.RequiredMode.REQUIRED)
private List<CommandStat> commandStats; private List<CommandStat> commandStats;
@Schema(description = "Redis 命令统计结果") @Schema(description = "Redis 命令统计结果")
@ -30,15 +30,15 @@ public class RedisMonitorRespVO {
@AllArgsConstructor @AllArgsConstructor
public static class CommandStat { public static class CommandStat {
@Schema(description = "Redis 命令", required = true, example = "get") @Schema(description = "Redis 命令", requiredMode = Schema.RequiredMode.REQUIRED, example = "get")
private String command; private String command;
@Schema(description = "调用次数", required = true, example = "1024") @Schema(description = "调用次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Integer calls; private Integer calls;
@Schema(description = "消耗 CPU 秒数", required = true, example = "666") @Schema(description = "消耗 CPU 秒数", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
private Long usec; private Long usec;
} }
} }

View File

@ -11,23 +11,23 @@ import javax.validation.constraints.*;
@Data @Data
public class TestDemoBaseVO { public class TestDemoBaseVO {
@Schema(description = "名字", required = true) @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "名字不能为空") @NotNull(message = "名字不能为空")
private String name; private String name;
@Schema(description = "状态", required = true) @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "状态不能为空") @NotNull(message = "状态不能为空")
private Integer status; private Integer status;
@Schema(description = "类型", required = true) @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "类型不能为空") @NotNull(message = "类型不能为空")
private Integer type; private Integer type;
@Schema(description = "分类", required = true) @Schema(description = "分类", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "分类不能为空") @NotNull(message = "分类不能为空")
private Integer category; private Integer category;
@Schema(description = "备注") @Schema(description = "备注")
private String remark; private String remark;
} }

View File

@ -14,10 +14,10 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class TestDemoRespVO extends TestDemoBaseVO { public class TestDemoRespVO extends TestDemoBaseVO {
@Schema(description = "编号", required = true) @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
private Long id; private Long id;
@Schema(description = "创建时间", required = true) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -10,8 +10,8 @@ import javax.validation.constraints.*;
@ToString(callSuper = true) @ToString(callSuper = true)
public class TestDemoUpdateReqVO extends TestDemoBaseVO { public class TestDemoUpdateReqVO extends TestDemoBaseVO {
@Schema(description = "编号", required = true) @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "编号不能为空") @NotNull(message = "编号不能为空")
private Long id; private Long id;
} }

View File

@ -8,7 +8,7 @@ import javax.validation.constraints.NotEmpty;
@Data @Data
public class GoViewDataGetBySqlReqVO { public class GoViewDataGetBySqlReqVO {
// @Schema(description = "SQL 语句", required = true, example = "SELECT * FROM user") // @Schema(description = "SQL 语句", requiredMode = Schema.RequiredMode.REQUIRED, example = "SELECT * FROM user")
@NotEmpty(message = "SQL 语句不能为空") @NotEmpty(message = "SQL 语句不能为空")
private String sql; private String sql;

View File

@ -10,10 +10,10 @@ import java.util.Map;
@Data @Data
public class GoViewDataRespVO { public class GoViewDataRespVO {
// @Schema(description = "数据维度", required = true, example = "['product', 'data1', 'data2']") // @Schema(description = "数据维度", requiredMode = Schema.RequiredMode.REQUIRED, example = "['product', 'data1', 'data2']")
private List<String> dimensions; private List<String> dimensions;
// @Schema(description = "数据明细列表", required = true) // @Schema(description = "数据明细列表", requiredMode = Schema.RequiredMode.REQUIRED)
private List<Map<String, Object>> source; private List<Map<String, Object>> source;
} }

View File

@ -8,7 +8,7 @@ import javax.validation.constraints.NotEmpty;
@Data @Data
public class GoViewProjectCreateReqVO { public class GoViewProjectCreateReqVO {
// @Schema(description = "项目名称", required = true, example = "王五") // @Schema(description = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@NotEmpty(message = "项目名称不能为空") @NotEmpty(message = "项目名称不能为空")
private String name; private String name;

View File

@ -8,13 +8,13 @@ import java.time.LocalDateTime;
@Data @Data
public class GoViewProjectRespVO { public class GoViewProjectRespVO {
// @Schema(description = "编号", required = true, example = "18993") // @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18993")
private Long id; private Long id;
// @Schema(description = "项目名称", required = true, example = "王五") // @Schema(description = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
private String name; private String name;
// @Schema(description = "发布状态", required = true, example = "1") // @Schema(description = "发布状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer status; private Integer status;
// @Schema(description = "报表内容") // JSON 格式 // @Schema(description = "报表内容") // JSON 格式
@ -26,10 +26,10 @@ public class GoViewProjectRespVO {
// @Schema(description = "项目备注", example = "你猜") // @Schema(description = "项目备注", example = "你猜")
private String remark; private String remark;
// @Schema(description = "创建人编号", required = true, example = "1024") // @Schema(description = "创建人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String creator; private String creator;
// @Schema(description = "创建时间", required = true) // @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -10,14 +10,14 @@ import javax.validation.constraints.NotNull;
@Data @Data
public class GoViewProjectUpdateReqVO { public class GoViewProjectUpdateReqVO {
// @Schema(description = "编号", required = true, example = "18993") // @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18993")
@NotNull(message = "编号不能为空") @NotNull(message = "编号不能为空")
private Long id; private Long id;
// @Schema(description = "项目名称", required = true, example = "王五") // @Schema(description = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
private String name; private String name;
// @Schema(description = "发布状态", required = true, example = "1") // @Schema(description = "发布状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@InEnum(value = CommonStatusEnum.class, message = "发布状态必须是 {value}") @InEnum(value = CommonStatusEnum.class, message = "发布状态必须是 {value}")
private Integer status; private Integer status;

View File

@ -22,34 +22,34 @@ import javax.validation.constraints.Pattern;
@Builder @Builder
public class AuthLoginReqVO { public class AuthLoginReqVO {
@Schema(description = "账号", required = true, example = "yudaoyuanma") @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudaoyuanma")
@NotEmpty(message = "登录账号不能为空") @NotEmpty(message = "登录账号不能为空")
@Length(min = 4, max = 16, message = "账号长度为 4-16 位") @Length(min = 4, max = 16, message = "账号长度为 4-16 位")
@Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母") @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
private String username; private String username;
@Schema(description = "密码", required = true, example = "buzhidao") @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
@NotEmpty(message = "密码不能为空") @NotEmpty(message = "密码不能为空")
@Length(min = 4, max = 16, message = "密码长度为 4-16 位") @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
private String password; private String password;
// ========== 图片验证码相关 ========== // ========== 图片验证码相关 ==========
@Schema(description = "验证码,验证码开启时,需要传递", required = true, @Schema(description = "验证码,验证码开启时,需要传递", requiredMode = Schema.RequiredMode.REQUIRED,
example = "PfcH6mgr8tpXuMWFjvW6YVaqrswIuwmWI5dsVZSg7sGpWtDCUbHuDEXl3cFB1+VvCC/rAkSwK8Fad52FSuncVg==") example = "PfcH6mgr8tpXuMWFjvW6YVaqrswIuwmWI5dsVZSg7sGpWtDCUbHuDEXl3cFB1+VvCC/rAkSwK8Fad52FSuncVg==")
@NotEmpty(message = "验证码不能为空", groups = CodeEnableGroup.class) @NotEmpty(message = "验证码不能为空", groups = CodeEnableGroup.class)
private String captchaVerification; private String captchaVerification;
// ========== 绑定社交登录时,需要传递如下参数 ========== // ========== 绑定社交登录时,需要传递如下参数 ==========
@Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", required = true, example = "10") @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@InEnum(SocialTypeEnum.class) @InEnum(SocialTypeEnum.class)
private Integer socialType; private Integer socialType;
@Schema(description = "授权码", required = true, example = "1024") @Schema(description = "授权码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String socialCode; private String socialCode;
@Schema(description = "state", required = true, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62") @Schema(description = "state", requiredMode = Schema.RequiredMode.REQUIRED, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62")
private String socialState; private String socialState;
/** /**
@ -68,4 +68,4 @@ public class AuthLoginReqVO {
return socialType == null || StrUtil.isNotEmpty(socialState); return socialType == null || StrUtil.isNotEmpty(socialState);
} }
} }

View File

@ -16,16 +16,16 @@ import java.time.LocalDateTime;
@Builder @Builder
public class AuthLoginRespVO { public class AuthLoginRespVO {
@Schema(description = "用户编号", required = true, example = "1024") @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long userId; private Long userId;
@Schema(description = "访问令牌", required = true, example = "happy") @Schema(description = "访问令牌", requiredMode = Schema.RequiredMode.REQUIRED, example = "happy")
private String accessToken; private String accessToken;
@Schema(description = "刷新令牌", required = true, example = "nice") @Schema(description = "刷新令牌", requiredMode = Schema.RequiredMode.REQUIRED, example = "nice")
private String refreshToken; private String refreshToken;
@Schema(description = "过期时间", required = true) @Schema(description = "过期时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime expiresTime; private LocalDateTime expiresTime;
} }

View File

@ -15,13 +15,13 @@ import java.util.List;
@Builder @Builder
public class AuthMenuRespVO { public class AuthMenuRespVO {
@Schema(description = "菜单名称", required = true, example = "芋道") @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private Long id; private Long id;
@Schema(description = "父菜单 ID", required = true, example = "1024") @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long parentId; private Long parentId;
@Schema(description = "菜单名称", required = true, example = "芋道") @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name; private String name;
@Schema(description = "路由地址,仅菜单类型为菜单或者目录时,才需要传", example = "post") @Schema(description = "路由地址,仅菜单类型为菜单或者目录时,才需要传", example = "post")
@ -36,10 +36,10 @@ public class AuthMenuRespVO {
@Schema(description = "菜单图标,仅菜单类型为菜单或者目录时,才需要传", example = "/menu/list") @Schema(description = "菜单图标,仅菜单类型为菜单或者目录时,才需要传", example = "/menu/list")
private String icon; private String icon;
@Schema(description = "是否可见", required = true, example = "false") @Schema(description = "是否可见", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
private Boolean visible; private Boolean visible;
@Schema(description = "是否缓存", required = true, example = "false") @Schema(description = "是否缓存", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
private Boolean keepAlive; private Boolean keepAlive;
@Schema(description = "是否总是显示", example = "false") @Schema(description = "是否总是显示", example = "false")

View File

@ -16,13 +16,13 @@ import java.util.Set;
@Builder @Builder
public class AuthPermissionInfoRespVO { public class AuthPermissionInfoRespVO {
@Schema(description = "用户信息", required = true) @Schema(description = "用户信息", requiredMode = Schema.RequiredMode.REQUIRED)
private UserVO user; private UserVO user;
@Schema(description = "角色标识数组", required = true) @Schema(description = "角色标识数组", requiredMode = Schema.RequiredMode.REQUIRED)
private Set<String> roles; private Set<String> roles;
@Schema(description = "操作权限数组", required = true) @Schema(description = "操作权限数组", requiredMode = Schema.RequiredMode.REQUIRED)
private Set<String> permissions; private Set<String> permissions;
@Schema(description = "用户信息 VO") @Schema(description = "用户信息 VO")
@ -32,15 +32,15 @@ public class AuthPermissionInfoRespVO {
@Builder @Builder
public static class UserVO { public static class UserVO {
@Schema(description = "用户编号", required = true, example = "1024") @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "用户昵称", required = true, example = "芋道源码") @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
private String nickname; private String nickname;
@Schema(description = "用户头像", required = true, example = "http://www.iocoder.cn/xx.jpg") @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "http://www.iocoder.cn/xx.jpg")
private String avatar; private String avatar;
} }
} }

View File

@ -17,13 +17,13 @@ import javax.validation.constraints.NotEmpty;
@Builder @Builder
public class AuthSmsLoginReqVO { public class AuthSmsLoginReqVO {
@Schema(description = "手机号", required = true, example = "yudaoyuanma") @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudaoyuanma")
@NotEmpty(message = "手机号不能为空") @NotEmpty(message = "手机号不能为空")
@Mobile @Mobile
private String mobile; private String mobile;
@Schema(description = "短信验证码", required = true, example = "1024") @Schema(description = "短信验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "验证码不能为空") @NotEmpty(message = "验证码不能为空")
private String code; private String code;
} }

View File

@ -20,14 +20,14 @@ import javax.validation.constraints.NotNull;
@Builder @Builder
public class AuthSmsSendReqVO { public class AuthSmsSendReqVO {
@Schema(description = "手机号", required = true, example = "yudaoyuanma") @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudaoyuanma")
@NotEmpty(message = "手机号不能为空") @NotEmpty(message = "手机号不能为空")
@Mobile @Mobile
private String mobile; private String mobile;
@Schema(description = "短信场景", required = true, example = "1") @Schema(description = "短信场景", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "发送场景不能为空") @NotNull(message = "发送场景不能为空")
@InEnum(SmsSceneEnum.class) @InEnum(SmsSceneEnum.class)
private Integer scene; private Integer scene;
} }

View File

@ -21,28 +21,28 @@ import javax.validation.constraints.Pattern;
@Builder @Builder
public class AuthSocialBindLoginReqVO { public class AuthSocialBindLoginReqVO {
@Schema(description = "社交平台的类型,参见 UserSocialTypeEnum 枚举值", required = true, example = "10" ) @Schema(description = "社交平台的类型,参见 UserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10" )
@InEnum(SocialTypeEnum.class) @InEnum(SocialTypeEnum.class)
@NotNull(message = "社交平台的类型不能为空") @NotNull(message = "社交平台的类型不能为空")
private Integer type; private Integer type;
@Schema(description = "授权码", required = true, example = "1024") @Schema(description = "授权码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "授权码不能为空") @NotEmpty(message = "授权码不能为空")
private String code; private String code;
@Schema(description = "state", required = true, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62") @Schema(description = "state", requiredMode = Schema.RequiredMode.REQUIRED, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62")
@NotEmpty(message = "state 不能为空") @NotEmpty(message = "state 不能为空")
private String state; private String state;
@Schema(description = "账号", required = true, example = "yudaoyuanma") @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudaoyuanma")
@NotEmpty(message = "登录账号不能为空") @NotEmpty(message = "登录账号不能为空")
@Length(min = 4, max = 16, message = "账号长度为 4-16 位") @Length(min = 4, max = 16, message = "账号长度为 4-16 位")
@Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母") @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
private String username; private String username;
@Schema(description = "密码", required = true, example = "buzhidao") @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
@NotEmpty(message = "密码不能为空") @NotEmpty(message = "密码不能为空")
@Length(min = 4, max = 16, message = "密码长度为 4-16 位") @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
private String password; private String password;
} }

View File

@ -19,17 +19,17 @@ import javax.validation.constraints.NotNull;
@Builder @Builder
public class AuthSocialLoginReqVO { public class AuthSocialLoginReqVO {
@Schema(description = "社交平台的类型,参见 UserSocialTypeEnum 枚举值", required = true, example = "10") @Schema(description = "社交平台的类型,参见 UserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@InEnum(SocialTypeEnum.class) @InEnum(SocialTypeEnum.class)
@NotNull(message = "社交平台的类型不能为空") @NotNull(message = "社交平台的类型不能为空")
private Integer type; private Integer type;
@Schema(description = "授权码", required = true, example = "1024") @Schema(description = "授权码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "授权码不能为空") @NotEmpty(message = "授权码不能为空")
private String code; private String code;
@Schema(description = "state", required = true, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62") @Schema(description = "state", requiredMode = Schema.RequiredMode.REQUIRED, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62")
@NotEmpty(message = "state 不能为空") @NotEmpty(message = "state 不能为空")
private String state; private String state;
} }

View File

@ -15,7 +15,7 @@ import javax.validation.constraints.Size;
@Data @Data
public class DeptBaseVO { public class DeptBaseVO {
@Schema(description = "菜单名称", required = true, example = "芋道") @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@NotBlank(message = "部门名称不能为空") @NotBlank(message = "部门名称不能为空")
@Size(max = 30, message = "部门名称长度不能超过30个字符") @Size(max = 30, message = "部门名称长度不能超过30个字符")
private String name; private String name;
@ -23,7 +23,7 @@ public class DeptBaseVO {
@Schema(description = "父菜单 ID", example = "1024") @Schema(description = "父菜单 ID", example = "1024")
private Long parentId; private Long parentId;
@Schema(description = "显示顺序不能为空", required = true, example = "1024") @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "显示顺序不能为空") @NotNull(message = "显示顺序不能为空")
private Integer sort; private Integer sort;
@ -39,9 +39,9 @@ public class DeptBaseVO {
@Size(max = 50, message = "邮箱长度不能超过50个字符") @Size(max = 50, message = "邮箱长度不能超过50个字符")
private String email; private String email;
@Schema(description = "状态,见 CommonStatusEnum 枚举", required = true, example = "1") @Schema(description = "状态,见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "状态不能为空") @NotNull(message = "状态不能为空")
// @InEnum(value = CommonStatusEnum.class, message = "修改状态必须是 {value}") // @InEnum(value = CommonStatusEnum.class, message = "修改状态必须是 {value}")
private Integer status; private Integer status;
} }

View File

@ -12,13 +12,13 @@ import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class DeptRespVO extends DeptBaseVO { public class DeptRespVO extends DeptBaseVO {
@Schema(description = "部门编号", required = true, example = "1024") @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "状态,参见 CommonStatusEnum 枚举类", required = true, example = "1") @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer status; private Integer status;
@Schema(description = "创建时间", required = true, example = "时间戳格式") @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
private LocalDateTime createTime; private LocalDateTime createTime;
} }

View File

@ -12,13 +12,13 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
public class DeptSimpleRespVO { public class DeptSimpleRespVO {
@Schema(description = "部门编号", required = true, example = "1024") @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "部门名称", required = true, example = "芋道") @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name; private String name;
@Schema(description = "父部门 ID", required = true, example = "1024") @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long parentId; private Long parentId;
} }

View File

@ -12,8 +12,8 @@ import javax.validation.constraints.NotNull;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class DeptUpdateReqVO extends DeptBaseVO { public class DeptUpdateReqVO extends DeptBaseVO {
@Schema(description = "部门编号", required = true, example = "1024") @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "部门编号不能为空") @NotNull(message = "部门编号不能为空")
private Long id; private Long id;
} }

View File

@ -14,24 +14,24 @@ import javax.validation.constraints.Size;
@Data @Data
public class PostBaseVO { public class PostBaseVO {
@Schema(description = "岗位名称", required = true, example = "小博主") @Schema(description = "岗位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "小博主")
@NotBlank(message = "岗位名称不能为空") @NotBlank(message = "岗位名称不能为空")
@Size(max = 50, message = "岗位名称长度不能超过50个字符") @Size(max = 50, message = "岗位名称长度不能超过50个字符")
private String name; private String name;
@Schema(description = "岗位编码", required = true, example = "yudao") @Schema(description = "岗位编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao")
@NotBlank(message = "岗位编码不能为空") @NotBlank(message = "岗位编码不能为空")
@Size(max = 64, message = "岗位编码长度不能超过64个字符") @Size(max = 64, message = "岗位编码长度不能超过64个字符")
private String code; private String code;
@Schema(description = "显示顺序不能为空", required = true, example = "1024") @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "显示顺序不能为空") @NotNull(message = "显示顺序不能为空")
private Integer sort; private Integer sort;
@Schema(description = "状态,参见 CommonStatusEnum 枚举类", required = true, example = "1") @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer status; private Integer status;
@Schema(description = "备注", example = "快乐的备注") @Schema(description = "备注", example = "快乐的备注")
private String remark; private String remark;
} }

View File

@ -12,10 +12,10 @@ import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class PostRespVO extends PostBaseVO { public class PostRespVO extends PostBaseVO {
@Schema(description = "岗位序号", required = true, example = "1024") @Schema(description = "岗位序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id; private Long id;
@Schema(description = "创建时间", required = true, example = "时间戳格式") @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
private LocalDateTime createTime; private LocalDateTime createTime;
} }

Some files were not shown because too many files have changed in this diff Show More