Commit 12d6c14b1cf3846f04dc1396ea7695121b9c4c57

Authored by 芋道源码
Committed by Gitee
2 parents dbdf1d9f 85047bca

!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性

Merge pull request !469 from xingyu/fix/vue3_codegen
Showing 352 changed files with 1434 additions and 1340 deletions

Too many changes.

To preserve performance only 100 of 352 files are displayed.

README.md
... ... @@ -249,7 +249,7 @@ ps:核心功能已经实现,正在对接微信小程序中...
249 249  
250 250 | 框架 | 说明 | 版本 | 学习指南 |
251 251 |---------------------------------------------------------------------------------------------|------------------|-------------|----------------------------------------------------------------|
252   -| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.7.10 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
  252 +| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.7.11 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
253 253 | [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | |
254 254 | [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.16 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
255 255 | [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.3.1 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) |
... ... @@ -266,7 +266,7 @@ ps:核心功能已经实现,正在对接微信小程序中...
266 266 | [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.12.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) |
267 267 | [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.7.10 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) |
268 268 | [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | |
269   -| [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.3.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) |
  269 +| [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.5.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) |
270 270 | [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.26 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) |
271 271 | [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.8.2 | - |
272 272 | [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 4.8.0 | - |
... ...
... ... @@ -39,8 +39,8 @@
39 39 <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
40 40 <!-- 看看咋放到 bom 里 -->
41 41 <lombok.version>1.18.26</lombok.version>
42   - <spring.boot.version>2.7.10</spring.boot.version>
43   - <mapstruct.version>1.5.3.Final</mapstruct.version>
  42 + <spring.boot.version>2.7.11</spring.boot.version>
  43 + <mapstruct.version>1.5.5.Final</mapstruct.version>
44 44 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
45 45 </properties>
46 46  
... ...
yudao-dependencies/pom.xml
... ... @@ -16,7 +16,7 @@
16 16 <properties>
17 17 <revision>1.7.2-snapshot</revision>
18 18 <!-- 统一依赖管理 -->
19   - <spring.boot.version>2.7.10</spring.boot.version>
  19 + <spring.boot.version>2.7.11</spring.boot.version>
20 20 <!-- Web 相关 -->
21 21 <springdoc.version>1.6.15</springdoc.version>
22 22 <knife4j.version>4.1.0</knife4j.version>
... ... @@ -46,9 +46,9 @@
46 46 <captcha-plus.version>1.0.2</captcha-plus.version>
47 47 <jsoup.version>1.15.4</jsoup.version>
48 48 <lombok.version>1.18.26</lombok.version>
49   - <mapstruct.version>1.5.3.Final</mapstruct.version>
50   - <hutool.version>5.8.15</hutool.version>
51   - <easyexcel.verion>3.2.1</easyexcel.verion>
  49 + <mapstruct.version>1.5.5.Final</mapstruct.version>
  50 + <hutool.version>5.8.18</hutool.version>
  51 + <easyexcel.verion>3.3.0</easyexcel.verion>
52 52 <velocity.version>2.3</velocity.version>
53 53 <screw.version>1.0.5</screw.version>
54 54 <fastjson.version>1.2.83</fastjson.version>
... ...
yudao-example/yudao-sso-demo-by-code/pom.xml
... ... @@ -21,7 +21,7 @@
21 21 <maven.compiler.target>8</maven.compiler.target>
22 22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23 23 <!-- 统一依赖管理 -->
24   - <spring.boot.version>2.7.10</spring.boot.version>
  24 + <spring.boot.version>2.7.11</spring.boot.version>
25 25 </properties>
26 26  
27 27 <dependencyManagement>
... ... @@ -52,7 +52,7 @@
52 52 <dependency>
53 53 <groupId>cn.hutool</groupId>
54 54 <artifactId>hutool-all</artifactId>
55   - <version>5.8.15</version>
  55 + <version>5.8.18</version>
56 56 </dependency>
57 57  
58 58 <dependency>
... ...
yudao-example/yudao-sso-demo-by-password/pom.xml
... ... @@ -21,7 +21,7 @@
21 21 <maven.compiler.target>8</maven.compiler.target>
22 22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23 23 <!-- 统一依赖管理 -->
24   - <spring.boot.version>2.7.10</spring.boot.version>
  24 + <spring.boot.version>2.7.11</spring.boot.version>
25 25 </properties>
26 26  
27 27 <dependencyManagement>
... ... @@ -52,7 +52,7 @@
52 52 <dependency>
53 53 <groupId>cn.hutool</groupId>
54 54 <artifactId>hutool-all</artifactId>
55   - <version>5.8.15</version>
  55 + <version>5.8.18</version>
56 56 </dependency>
57 57  
58 58 <dependency>
... ...
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java
... ... @@ -15,12 +15,12 @@ public class PageParam implements Serializable {
15 15 private static final Integer PAGE_NO = 1;
16 16 private static final Integer PAGE_SIZE = 10;
17 17  
18   - @Schema(description = "页码,从 1 开始", required = true,example = "1")
  18 + @Schema(description = "页码,从 1 开始", requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
19 19 @NotNull(message = "页码不能为空")
20 20 @Min(value = 1, message = "页码最小值为 1")
21 21 private Integer pageNo = PAGE_NO;
22 22  
23   - @Schema(description = "每页条数,最大值为 100", required = true, example = "10")
  23 + @Schema(description = "每页条数,最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
24 24 @NotNull(message = "每页条数不能为空")
25 25 @Min(value = 1, message = "每页条数最小值为 1")
26 26 @Max(value = 100, message = "每页条数最大值为 100")
... ...
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java
... ... @@ -11,10 +11,10 @@ import java.util.List;
11 11 @Data
12 12 public final class PageResult<T> implements Serializable {
13 13  
14   - @Schema(description = "数据", required = true)
  14 + @Schema(description = "数据", requiredMode = Schema.RequiredMode.REQUIRED)
15 15 private List<T> list;
16 16  
17   - @Schema(description = "总量", required = true)
  17 + @Schema(description = "总量", requiredMode = Schema.RequiredMode.REQUIRED)
18 18 private Long total;
19 19  
20 20 public PageResult() {
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java
... ... @@ -10,11 +10,11 @@ import javax.validation.constraints.*;
10 10 @Data
11 11 public class BpmFormBaseVO {
12 12  
13   - @Schema(description = "表单名称", required = true, example = "芋道")
  13 + @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
14 14 @NotNull(message = "表单名称不能为空")
15 15 private String name;
16 16  
17   - @Schema(description = "表单状态-参见 CommonStatusEnum 枚举", required = true, example = "1")
  17 + @Schema(description = "表单状态-参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
18 18 @NotNull(message = "表单状态不能为空")
19 19 private Integer status;
20 20  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java
... ... @@ -11,11 +11,11 @@ import java.util.List;
11 11 @ToString(callSuper = true)
12 12 public class BpmFormCreateReqVO extends BpmFormBaseVO {
13 13  
14   - @Schema(description = "表单的配置-JSON 字符串", required = true)
  14 + @Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
15 15 @NotNull(message = "表单的配置不能为空")
16 16 private String conf;
17 17  
18   - @Schema(description = "表单项的数组-JSON 字符串的数组", required = true)
  18 + @Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
19 19 @NotNull(message = "表单项的数组不能为空")
20 20 private List<String> fields;
21 21  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java
... ... @@ -14,18 +14,18 @@ import java.util.List;
14 14 @ToString(callSuper = true)
15 15 public class BpmFormRespVO extends BpmFormBaseVO {
16 16  
17   - @Schema(description = "表单编号", required = true, example = "1024")
  17 + @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
18 18 private Long id;
19 19  
20   - @Schema(description = "表单的配置-JSON 字符串", required = true)
  20 + @Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
21 21 @NotNull(message = "表单的配置不能为空")
22 22 private String conf;
23 23  
24   - @Schema(description = "表单项的数组-JSON 字符串的数组", required = true)
  24 + @Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
25 25 @NotNull(message = "表单项的数组不能为空")
26 26 private List<String> fields;
27 27  
28   - @Schema(description = "创建时间", required = true)
  28 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
29 29 private LocalDateTime createTime;
30 30  
31 31 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormSimpleRespVO.java
... ... @@ -7,10 +7,10 @@ import lombok.Data;
7 7 @Data
8 8 public class BpmFormSimpleRespVO {
9 9  
10   - @Schema(description = "表单编号", required = true, example = "1024")
  10 + @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
11 11 private Long id;
12 12  
13   - @Schema(description = "表单名称", required = true, example = "芋道")
  13 + @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
14 14 private String name;
15 15  
16 16 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java
... ... @@ -10,15 +10,15 @@ import java.util.List;
10 10 @ToString(callSuper = true)
11 11 public class BpmFormUpdateReqVO extends BpmFormBaseVO {
12 12  
13   - @Schema(description = "表单编号", required = true, example = "1024")
  13 + @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
14 14 @NotNull(message = "表单编号不能为空")
15 15 private Long id;
16 16  
17   - @Schema(description = "表单的配置-JSON 字符串", required = true)
  17 + @Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
18 18 @NotNull(message = "表单的配置不能为空")
19 19 private String conf;
20 20  
21   - @Schema(description = "表单项的数组-JSON 字符串的数组", required = true)
  21 + @Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
22 22 @NotNull(message = "表单项的数组不能为空")
23 23 private List<String> fields;
24 24  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupBaseVO.java
1 1 package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3   -import lombok.*;
4   -import java.util.*;
5   -import javax.validation.constraints.*;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +import java.util.Set;
6 8  
7 9 /**
8 10 * 用户组 Base VO,提供给添加、修改、详细的子 VO 使用
... ... @@ -11,19 +13,19 @@ import javax.validation.constraints.*;
11 13 @Data
12 14 public class BpmUserGroupBaseVO {
13 15  
14   - @Schema(description = "组名", required = true, example = "芋道")
  16 + @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
15 17 @NotNull(message = "组名不能为空")
16 18 private String name;
17 19  
18   - @Schema(description = "描述", required = true, example = "芋道源码")
  20 + @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
19 21 @NotNull(message = "描述不能为空")
20 22 private String description;
21 23  
22   - @Schema(description = "成员编号数组", required = true, example = "1,2,3")
  24 + @Schema(description = "成员编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")
23 25 @NotNull(message = "成员编号数组不能为空")
24 26 private Set<Long> memberUserIds;
25 27  
26   - @Schema(description = "状态", required = true, example = "1")
  28 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
27 29 @NotNull(message = "状态不能为空")
28 30 private Integer status;
29 31  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java
1 1 package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.*;
4 5  
5 6 import java.time.LocalDateTime;
6 7  
7   -
8 8 @Schema(description = "管理后台 - 用户组 Response VO")
9 9 @Data
10 10 @EqualsAndHashCode(callSuper = true)
11 11 @ToString(callSuper = true)
12 12 public class BpmUserGroupRespVO extends BpmUserGroupBaseVO {
13 13  
14   - @Schema(description = "编号", required = true, example = "1024")
  14 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
15 15 private Long id;
16 16  
17   - @Schema(description = "创建时间", required = true)
  17 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
18 18 private LocalDateTime createTime;
19 19  
20 20 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java
... ... @@ -11,10 +11,10 @@ import lombok.NoArgsConstructor;
11 11 @AllArgsConstructor
12 12 public class BpmUserGroupSimpleRespVO {
13 13  
14   - @Schema(description = "用户组编号", required = true, example = "1024")
  14 + @Schema(description = "用户组编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
15 15 private Long id;
16 16  
17   - @Schema(description = "用户组名字", required = true, example = "芋道")
  17 + @Schema(description = "用户组名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
18 18 private String name;
19 19  
20 20 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java
1 1 package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.*;
4 5 import javax.validation.constraints.*;
... ... @@ -9,7 +10,7 @@ import javax.validation.constraints.*;
9 10 @ToString(callSuper = true)
10 11 public class BpmUserGroupUpdateReqVO extends BpmUserGroupBaseVO {
11 12  
12   - @Schema(description = "编号", required = true, example = "1024")
  13 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 14 @NotNull(message = "编号不能为空")
14 15 private Long id;
15 16  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java
... ... @@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
14 14 @ToString(callSuper = true)
15 15 public class BpmModeImportReqVO extends BpmModelCreateReqVO {
16 16  
17   - @Schema(description = "BPMN 文件", required = true)
  17 + @Schema(description = "BPMN 文件", requiredMode = Schema.RequiredMode.REQUIRED)
18 18 @NotNull(message = "BPMN 文件不能为空")
19 19 private MultipartFile bpmnFile;
20 20  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java
... ... @@ -11,11 +11,11 @@ import javax.validation.constraints.NotEmpty;
11 11 @Data
12 12 public class BpmModelBaseVO {
13 13  
14   - @Schema(description = "流程标识", required = true, example = "process_yudao")
  14 + @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_yudao")
15 15 @NotEmpty(message = "流程标识不能为空")
16 16 private String key;
17 17  
18   - @Schema(description = "流程名称", required = true, example = "芋道")
  18 + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
19 19 @NotEmpty(message = "流程名称不能为空")
20 20 private String name;
21 21  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelCreateReqVO.java
... ... @@ -11,11 +11,11 @@ import javax.validation.constraints.NotEmpty;
11 11 @Data
12 12 public class BpmModelCreateReqVO {
13 13  
14   - @Schema(description = "流程标识", required = true, example = "process_yudao")
  14 + @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_yudao")
15 15 @NotEmpty(message = "流程标识不能为空")
16 16 private String key;
17 17  
18   - @Schema(description = "流程名称", required = true, example = "芋道")
  18 + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
19 19 @NotEmpty(message = "流程名称不能为空")
20 20 private String name;
21 21  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageItemRespVO.java
... ... @@ -13,13 +13,13 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class BpmModelPageItemRespVO extends BpmModelBaseVO {
15 15  
16   - @Schema(description = "编号", required = true, example = "1024")
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 private String id;
18 18  
19 19 @Schema(description = "表单名字", example = "请假表单")
20 20 private String formName;
21 21  
22   - @Schema(description = "创建时间", required = true)
  22 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
23 23 private LocalDateTime createTime;
24 24  
25 25 /**
... ... @@ -31,16 +31,16 @@ public class BpmModelPageItemRespVO extends BpmModelBaseVO {
31 31 @Data
32 32 public static class ProcessDefinition {
33 33  
34   - @Schema(description = "编号", required = true, example = "1024")
  34 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
35 35 private String id;
36 36  
37   - @Schema(description = "版本", required = true, example = "1")
  37 + @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
38 38 private Integer version;
39 39  
40   - @Schema(description = "部署时间", required = true)
  40 + @Schema(description = "部署时间", requiredMode = Schema.RequiredMode.REQUIRED)
41 41 private LocalDateTime deploymentTime;
42 42  
43   - @Schema(description = "中断状态-参见 SuspensionState 枚举", required = true, example = "1")
  43 + @Schema(description = "中断状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
44 44 private Integer suspensionState;
45 45  
46 46 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java
... ... @@ -13,13 +13,13 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class BpmModelRespVO extends BpmModelBaseVO {
15 15  
16   - @Schema(description = "编号", required = true, example = "1024")
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 private String id;
18 18  
19   - @Schema(description = "BPMN XML", required = true)
  19 + @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private String bpmnXml;
21 21  
22   - @Schema(description = "创建时间", required = true)
  22 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
23 23 private LocalDateTime createTime;
24 24  
25 25 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
... ... @@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
9 9 @Data
10 10 public class BpmModelUpdateReqVO {
11 11  
12   - @Schema(description = "编号", required = true, example = "1024")
  12 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 13 @NotEmpty(message = "编号不能为空")
14 14 private String id;
15 15  
... ... @@ -22,7 +22,7 @@ public class BpmModelUpdateReqVO {
22 22 @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
23 23 private String category;
24 24  
25   - @Schema(description = "BPMN XML", required = true)
  25 + @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
26 26 private String bpmnXml;
27 27  
28 28 @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java
... ... @@ -9,11 +9,11 @@ import javax.validation.constraints.NotNull;
9 9 @Data
10 10 public class BpmModelUpdateStateReqVO {
11 11  
12   - @Schema(description = "编号", required = true, example = "1024")
  12 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 13 @NotNull(message = "编号不能为空")
14 14 private String id;
15 15  
16   - @Schema(description = "状态-见 SuspensionState 枚举", required = true, example = "1")
  16 + @Schema(description = "状态-见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
17 17 @NotNull(message = "状态不能为空")
18 18 private Integer state;
19 19  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java
... ... @@ -16,7 +16,7 @@ public class BpmProcessDefinitionPageItemRespVO extends BpmProcessDefinitionResp
16 16 @Schema(description = "表单名字", example = "请假表单")
17 17 private String formName;
18 18  
19   - @Schema(description = "部署时间", required = true)
  19 + @Schema(description = "部署时间", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private LocalDateTime deploymentTime;
21 21  
22 22 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
... ... @@ -4,20 +4,19 @@ import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6 6 import javax.validation.constraints.NotEmpty;
7   -import javax.validation.constraints.NotNull;
8 7 import java.util.List;
9 8  
10 9 @Schema(description = "管理后台 - 流程定义 Response VO")
11 10 @Data
12 11 public class BpmProcessDefinitionRespVO {
13 12  
14   - @Schema(description = "编号", required = true, example = "1024")
  13 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
15 14 private String id;
16 15  
17   - @Schema(description = "版本", required = true, example = "1")
  16 + @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
18 17 private Integer version;
19 18  
20   - @Schema(description = "流程名称", required = true, example = "芋道")
  19 + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
21 20 @NotEmpty(message = "流程名称不能为空")
22 21 private String name;
23 22  
... ... @@ -32,9 +31,9 @@ public class BpmProcessDefinitionRespVO {
32 31 private Integer formType;
33 32 @Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "1024")
34 33 private Long formId;
35   - @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", required = true)
  34 + @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
36 35 private String formConf;
37   - @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", required = true)
  36 + @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
38 37 private List<String> formFields;
39 38 @Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空",
40 39 example = "/bpm/oa/leave/create")
... ... @@ -43,7 +42,7 @@ public class BpmProcessDefinitionRespVO {
43 42 example = "/bpm/oa/leave/view")
44 43 private String formCustomViewPath;
45 44  
46   - @Schema(description = "中断状态-参见 SuspensionState 枚举", required = true, example = "1")
  45 + @Schema(description = "中断状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
47 46 private Integer suspensionState;
48 47  
49 48 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java
1 1 package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.Data;
4 5  
5   -import javax.validation.constraints.NotEmpty;
6 6 import javax.validation.constraints.NotNull;
7 7 import java.util.Set;
8 8  
... ... @@ -13,11 +13,11 @@ import java.util.Set;
13 13 @Data
14 14 public class BpmTaskAssignRuleBaseVO {
15 15  
16   - @Schema(description = "规则类型", required = true, example = "bpm_task_assign_rule_type")
  16 + @Schema(description = "规则类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "bpm_task_assign_rule_type")
17 17 @NotNull(message = "规则类型不能为空")
18 18 private Integer type;
19 19  
20   - @Schema(description = "规则值数组", required = true, example = "1,2,3")
  20 + @Schema(description = "规则值数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")
21 21 @NotNull(message = "规则值数组不能为空")
22 22 private Set<Long> options;
23 23  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java
... ... @@ -13,11 +13,11 @@ import javax.validation.constraints.NotEmpty;
13 13 @ToString(callSuper = true)
14 14 public class BpmTaskAssignRuleCreateReqVO extends BpmTaskAssignRuleBaseVO {
15 15  
16   - @Schema(description = "流程模型的编号", required = true, example = "1024")
  16 + @Schema(description = "流程模型的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 @NotEmpty(message = "流程模型的编号不能为空")
18 18 private String modelId;
19 19  
20   - @Schema(description = "流程任务定义的编号", required = true, example = "2048")
  20 + @Schema(description = "流程任务定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
21 21 @NotEmpty(message = "流程任务定义的编号不能为空")
22 22 private String taskDefinitionKey;
23 23  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java
... ... @@ -11,18 +11,18 @@ import lombok.ToString;
11 11 @ToString(callSuper = true)
12 12 public class BpmTaskAssignRuleRespVO extends BpmTaskAssignRuleBaseVO {
13 13  
14   - @Schema(description = "任务分配规则的编号", required = true, example = "1024")
  14 + @Schema(description = "任务分配规则的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
15 15 private Long id;
16 16  
17   - @Schema(description = "流程模型的编号", required = true, example = "2048")
  17 + @Schema(description = "流程模型的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
18 18 private String modelId;
19 19  
20   - @Schema(description = "流程定义的编号", required = true, example = "4096")
  20 + @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4096")
21 21 private String processDefinitionId;
22 22  
23   - @Schema(description = "流程任务定义的编号", required = true, example = "2048")
  23 + @Schema(description = "流程任务定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
24 24 private String taskDefinitionKey;
25   - @Schema(description = "流程任务定义的名字", required = true, example = "关注芋道")
  25 + @Schema(description = "流程任务定义的名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "关注芋道")
26 26 private String taskDefinitionName;
27 27  
28 28 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java
... ... @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
13 13 @ToString(callSuper = true)
14 14 public class BpmTaskAssignRuleUpdateReqVO extends BpmTaskAssignRuleBaseVO {
15 15  
16   - @Schema(description = "任务分配规则的编号", required = true, example = "1024")
  16 + @Schema(description = "任务分配规则的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 @NotNull(message = "任务分配规则的编号不能为空")
18 18 private Long id;
19 19  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
1 1 package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.*;
4 5 import java.time.LocalDateTime;
... ... @@ -14,19 +15,19 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
14 15 @Data
15 16 public class BpmOALeaveBaseVO {
16 17  
17   - @Schema(description = "请假的开始时间", required = true)
  18 + @Schema(description = "请假的开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
18 19 @NotNull(message = "开始时间不能为空")
19 20 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
20 21 private LocalDateTime startTime;
21   - @Schema(description = "请假的结束时间", required = true)
  22 + @Schema(description = "请假的结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
22 23 @NotNull(message = "结束时间不能为空")
23 24 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
24 25 private LocalDateTime endTime;
25 26  
26   - @Schema(description = "请假类型-参见 bpm_oa_type 枚举", required = true, example = "1")
  27 + @Schema(description = "请假类型-参见 bpm_oa_type 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
27 28 private Integer type;
28 29  
29   - @Schema(description = "原因", required = true, example = "阅读芋道源码")
  30 + @Schema(description = "原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "阅读芋道源码")
30 31 private String reason;
31 32  
32 33 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java
1 1 package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.*;
4 5 import org.springframework.format.annotation.DateTimeFormat;
... ... @@ -14,13 +15,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
14 15 @ToString(callSuper = true)
15 16 public class BpmOALeaveRespVO extends BpmOALeaveBaseVO {
16 17  
17   - @Schema(description = "请假表单主键", required = true, example = "1024")
  18 + @Schema(description = "请假表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
18 19 private Long id;
19 20  
20   - @Schema(description = "状态-参见 bpm_process_instance_result 枚举", required = true, example = "1")
  21 + @Schema(description = "状态-参见 bpm_process_instance_result 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
21 22 private Integer result;
22 23  
23   - @Schema(description = "申请时间", required = true)
  24 + @Schema(description = "申请时间", requiredMode = Schema.RequiredMode.REQUIRED)
24 25 @NotNull(message = "申请时间不能为空")
25 26 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
26 27 private LocalDateTime createTime;
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java
... ... @@ -9,14 +9,14 @@ import java.time.LocalDateTime;
9 9 @Data
10 10 public class BpmActivityRespVO {
11 11  
12   - @Schema(description = "流程活动的标识", required = true, example = "1024")
  12 + @Schema(description = "流程活动的标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 13 private String key;
14   - @Schema(description = "流程活动的类型", required = true, example = "StartEvent")
  14 + @Schema(description = "流程活动的类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartEvent")
15 15 private String type;
16 16  
17   - @Schema(description = "流程活动的开始时间", required = true)
  17 + @Schema(description = "流程活动的开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
18 18 private LocalDateTime startTime;
19   - @Schema(description = "流程活动的结束时间", required = true)
  19 + @Schema(description = "流程活动的结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private LocalDateTime endTime;
21 21  
22 22 @Schema(description = "关联的流程任务的编号-关联的流程任务,只有 UserTask 等类型才有", example = "2048")
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java
... ... @@ -4,18 +4,16 @@ import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6 6 import javax.validation.constraints.NotEmpty;
7   -import javax.validation.constraints.NotNull;
8   -import java.util.Map;
9 7  
10 8 @Schema(description = "管理后台 - 流程实例的取消 Request VO")
11 9 @Data
12 10 public class BpmProcessInstanceCancelReqVO {
13 11  
14   - @Schema(description = "流程实例的编号", required = true, example = "1024")
  12 + @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
15 13 @NotEmpty(message = "流程实例的编号不能为空")
16 14 private String id;
17 15  
18   - @Schema(description = "取消原因", required = true, example = "不请假了!")
  16 + @Schema(description = "取消原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "不请假了!")
19 17 @NotEmpty(message = "取消原因不能为空")
20 18 private String reason;
21 19  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java
... ... @@ -10,7 +10,7 @@ import java.util.Map;
10 10 @Data
11 11 public class BpmProcessInstanceCreateReqVO {
12 12  
13   - @Schema(description = "流程定义的编号", required = true, example = "1024")
  13 + @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
14 14 @NotEmpty(message = "流程定义编号不能为空")
15 15 private String processDefinitionId;
16 16  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java
... ... @@ -10,28 +10,28 @@ import java.util.List;
10 10 @Data
11 11 public class BpmProcessInstancePageItemRespVO {
12 12  
13   - @Schema(description = "流程实例的编号", required = true, example = "1024")
  13 + @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
14 14 private String id;
15 15  
16   - @Schema(description = "流程名称", required = true, example = "芋道")
  16 + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
17 17 private String name;
18 18  
19   - @Schema(description = "流程定义的编号", required = true, example = "2048")
  19 + @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
20 20 private String processDefinitionId;
21 21  
22   - @Schema(description = "流程分类-参见 bpm_model_category 数据字典", required = true, example = "1")
  22 + @Schema(description = "流程分类-参见 bpm_model_category 数据字典", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
23 23 private String category;
24 24  
25   - @Schema(description = "流程实例的状态-参见 bpm_process_instance_status", required = true, example = "1")
  25 + @Schema(description = "流程实例的状态-参见 bpm_process_instance_status", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
26 26 private Integer status;
27 27  
28   - @Schema(description = "流程实例的结果-参见 bpm_process_instance_result", required = true, example = "2")
  28 + @Schema(description = "流程实例的结果-参见 bpm_process_instance_result", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
29 29 private Integer result;
30 30  
31   - @Schema(description = "提交时间", required = true)
  31 + @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED)
32 32 private LocalDateTime createTime;
33 33  
34   - @Schema(description = "结束时间", required = true)
  34 + @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
35 35 private LocalDateTime endTime;
36 36  
37 37 /**
... ... @@ -43,10 +43,10 @@ public class BpmProcessInstancePageItemRespVO {
43 43 @Data
44 44 public static class Task {
45 45  
46   - @Schema(description = "流程任务的编号", required = true, example = "1024")
  46 + @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
47 47 private String id;
48 48  
49   - @Schema(description = "任务名称", required = true, example = "芋道")
  49 + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
50 50 private String name;
51 51  
52 52 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
... ... @@ -11,28 +11,28 @@ import java.util.Map;
11 11 @Data
12 12 public class BpmProcessInstanceRespVO {
13 13  
14   - @Schema(description = "流程实例的编号", required = true, example = "1024")
  14 + @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
15 15 private String id;
16 16  
17   - @Schema(description = "流程名称", required = true, example = "芋道")
  17 + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
18 18 private String name;
19 19  
20   - @Schema(description = "流程分类-参见 bpm_model_category 数据字典", required = true, example = "1")
  20 + @Schema(description = "流程分类-参见 bpm_model_category 数据字典", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
21 21 private String category;
22 22  
23   - @Schema(description = "流程实例的状态-参见 bpm_process_instance_status", required = true, example = "1")
  23 + @Schema(description = "流程实例的状态-参见 bpm_process_instance_status", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
24 24 private Integer status;
25 25  
26   - @Schema(description = "流程实例的结果-参见 bpm_process_instance_result", required = true, example = "2")
  26 + @Schema(description = "流程实例的结果-参见 bpm_process_instance_result", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
27 27 private Integer result;
28 28  
29   - @Schema(description = "提交时间", required = true)
  29 + @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED)
30 30 private LocalDateTime createTime;
31 31  
32   - @Schema(description = "结束时间", required = true)
  32 + @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
33 33 private LocalDateTime endTime;
34 34  
35   - @Schema(description = "提交的表单值", required = true)
  35 + @Schema(description = "提交的表单值", requiredMode = Schema.RequiredMode.REQUIRED)
36 36 private Map<String, Object> formVariables;
37 37  
38 38 @Schema(description = "业务的唯一标识-例如说,请假申请的编号", example = "1")
... ... @@ -52,14 +52,14 @@ public class BpmProcessInstanceRespVO {
52 52 @Data
53 53 public static class User {
54 54  
55   - @Schema(description = "用户编号", required = true, example = "1")
  55 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
56 56 private Long id;
57   - @Schema(description = "用户昵称", required = true, example = "芋艿")
  57 + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
58 58 private String nickname;
59 59  
60   - @Schema(description = "部门编号", required = true, example = "1")
  60 + @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
61 61 private Long deptId;
62   - @Schema(description = "部门名称", required = true, example = "研发部")
  62 + @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
63 63 private String deptName;
64 64  
65 65 }
... ... @@ -68,16 +68,16 @@ public class BpmProcessInstanceRespVO {
68 68 @Data
69 69 public static class ProcessDefinition {
70 70  
71   - @Schema(description = "编号", required = true, example = "1024")
  71 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
72 72 private String id;
73 73  
74 74 @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
75 75 private Integer formType;
76 76 @Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", example = "1024")
77 77 private Long formId;
78   - @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", required = true)
  78 + @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
79 79 private String formConf;
80   - @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", required = true)
  80 + @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
81 81 private List<String> formFields;
82 82 @Schema(description = "自定义表单的提交路径,使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时,必须非空",
83 83 example = "/bpm/oa/leave/create")
... ... @@ -86,7 +86,7 @@ public class BpmProcessInstanceRespVO {
86 86 example = "/bpm/oa/leave/view")
87 87 private String formCustomViewPath;
88 88  
89   - @Schema(description = "BPMN XML", required = true)
  89 + @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
90 90 private String bpmnXml;
91 91  
92 92 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
... ... @@ -9,11 +9,11 @@ import javax.validation.constraints.NotEmpty;
9 9 @Data
10 10 public class BpmTaskApproveReqVO {
11 11  
12   - @Schema(description = "任务编号", required = true, example = "1024")
  12 + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 13 @NotEmpty(message = "任务编号不能为空")
14 14 private String id;
15 15  
16   - @Schema(description = "审批意见", required = true, example = "不错不错!")
  16 + @Schema(description = "审批意见", requiredMode = Schema.RequiredMode.REQUIRED, example = "不错不错!")
17 17 @NotEmpty(message = "审批意见不能为空")
18 18 private String reason;
19 19  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java
... ... @@ -13,14 +13,14 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class BpmTaskDonePageItemRespVO extends BpmTaskTodoPageItemRespVO {
15 15  
16   - @Schema(description = "结束时间", required = true)
  16 + @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
17 17 private LocalDateTime endTime;
18   - @Schema(description = "持续时间", required = true, example = "1000")
  18 + @Schema(description = "持续时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
19 19 private Long durationInMillis;
20 20  
21   - @Schema(description = "任务结果-参见 bpm_process_instance_result", required = true, example = "2")
  21 + @Schema(description = "任务结果-参见 bpm_process_instance_result", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
22 22 private Integer result;
23   - @Schema(description = "审批建议", required = true, example = "不请假了!")
  23 + @Schema(description = "审批建议", requiredMode = Schema.RequiredMode.REQUIRED, example = "不请假了!")
24 24 private String reason;
25 25  
26 26 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java
... ... @@ -9,11 +9,11 @@ import javax.validation.constraints.NotEmpty;
9 9 @Data
10 10 public class BpmTaskRejectReqVO {
11 11  
12   - @Schema(description = "任务编号", required = true, example = "1024")
  12 + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 13 @NotEmpty(message = "任务编号不能为空")
14 14 private String id;
15 15  
16   - @Schema(description = "审批意见", required = true, example = "不错不错!")
  16 + @Schema(description = "审批意见", requiredMode = Schema.RequiredMode.REQUIRED, example = "不错不错!")
17 17 @NotEmpty(message = "审批意见不能为空")
18 18 private String reason;
19 19  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
... ... @@ -11,7 +11,7 @@ import lombok.ToString;
11 11 @ToString(callSuper = true)
12 12 public class BpmTaskRespVO extends BpmTaskDonePageItemRespVO {
13 13  
14   - @Schema(description = "任务定义的标识", required = true, example = "user-001")
  14 + @Schema(description = "任务定义的标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "user-001")
15 15 private String definitionKey;
16 16  
17 17 /**
... ... @@ -23,14 +23,14 @@ public class BpmTaskRespVO extends BpmTaskDonePageItemRespVO {
23 23 @Data
24 24 public static class User {
25 25  
26   - @Schema(description = "用户编号", required = true, example = "1")
  26 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
27 27 private Long id;
28   - @Schema(description = "用户昵称", required = true, example = "芋艿")
  28 + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
29 29 private String nickname;
30 30  
31   - @Schema(description = "部门编号", required = true, example = "1")
  31 + @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
32 32 private Long deptId;
33   - @Schema(description = "部门名称", required = true, example = "研发部")
  33 + @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
34 34 private String deptName;
35 35  
36 36 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java
... ... @@ -9,19 +9,19 @@ import java.time.LocalDateTime;
9 9 @Data
10 10 public class BpmTaskTodoPageItemRespVO {
11 11  
12   - @Schema(description = "任务编号", required = true, example = "1024")
  12 + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 13 private String id;
14 14  
15   - @Schema(description = "任务名字", required = true, example = "芋道")
  15 + @Schema(description = "任务名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
16 16 private String name;
17 17  
18   - @Schema(description = "接收时间", required = true)
  18 + @Schema(description = "接收时间", requiredMode = Schema.RequiredMode.REQUIRED)
19 19 private LocalDateTime claimTime;
20 20  
21   - @Schema(description = "创建时间", required = true)
  21 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
22 22 private LocalDateTime createTime;
23 23  
24   - @Schema(description = "激活状态-参见 SuspensionState 枚举", required = true, example = "1")
  24 + @Schema(description = "激活状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
25 25 private Integer suspensionState;
26 26  
27 27 /**
... ... @@ -33,19 +33,19 @@ public class BpmTaskTodoPageItemRespVO {
33 33 @Schema(description = "流程实例")
34 34 public static class ProcessInstance {
35 35  
36   - @Schema(description = "流程实例编号", required = true, example = "1024")
  36 + @Schema(description = "流程实例编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
37 37 private String id;
38 38  
39   - @Schema(description = "流程实例名称", required = true, example = "芋道")
  39 + @Schema(description = "流程实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
40 40 private String name;
41 41  
42   - @Schema(description = "发起人的用户编号", required = true, example = "1024")
  42 + @Schema(description = "发起人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
43 43 private Long startUserId;
44 44  
45   - @Schema(description = "发起人的用户昵称", required = true, example = "芋艿")
  45 + @Schema(description = "发起人的用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
46 46 private String startUserNickname;
47 47  
48   - @Schema(description = "流程定义的编号", required = true, example = "2048")
  48 + @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
49 49 private String processDefinitionId;
50 50  
51 51 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java
... ... @@ -2,9 +2,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5   -import lombok.EqualsAndHashCode;
6   -import lombok.ToString;
7   -import net.bytebuddy.implementation.bind.annotation.Empty;
8 5  
9 6 import javax.validation.constraints.NotEmpty;
10 7 import javax.validation.constraints.NotNull;
... ... @@ -13,11 +10,11 @@ import javax.validation.constraints.NotNull;
13 10 @Data
14 11 public class BpmTaskUpdateAssigneeReqVO {
15 12  
16   - @Schema(description = "任务编号", required = true, example = "1024")
  13 + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 14 @NotEmpty(message = "任务编号不能为空")
18 15 private String id;
19 16  
20   - @Schema(description = "新审批人的用户编号", required = true, example = "2048")
  17 + @Schema(description = "新审批人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
21 18 @NotNull(message = "新审批人的用户编号不能为空")
22 19 private Long assigneeUserId;
23 20  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java
... ... @@ -10,11 +10,11 @@ import java.util.List;
10 10 @Data
11 11 public class CodegenCreateListReqVO {
12 12  
13   - @Schema(description = "数据源配置的编号", required = true, example = "1")
  13 + @Schema(description = "数据源配置的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
14 14 @NotNull(message = "数据源配置的编号不能为空")
15 15 private Long dataSourceConfigId;
16 16  
17   - @Schema(description = "表名数组", required = true, example = "[1, 2, 3]")
  17 + @Schema(description = "表名数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1, 2, 3]")
18 18 @NotNull(message = "表名数组不能为空")
19 19 private List<String> tableNames;
20 20  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java
... ... @@ -7,10 +7,10 @@ import lombok.Data;
7 7 @Data
8 8 public class CodegenPreviewRespVO {
9 9  
10   - @Schema(description = "文件路径", required = true, example = "java/cn/iocoder/yudao/adminserver/modules/system/controller/test/SysTestDemoController.java")
  10 + @Schema(description = "文件路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "java/cn/iocoder/yudao/adminserver/modules/system/controller/test/SysTestDemoController.java")
11 11 private String filePath;
12 12  
13   - @Schema(description = "代码", required = true, example = "Hello World")
  13 + @Schema(description = "代码", requiredMode = Schema.RequiredMode.REQUIRED, example = "Hello World")
14 14 private String code;
15 15  
16 16 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java
... ... @@ -33,7 +33,7 @@ public class CodegenUpdateReqVO {
33 33 @Valid
34 34 public static class Table extends CodegenTableBaseVO {
35 35  
36   - @Schema(description = "编号", required = true, example = "1")
  36 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
37 37 private Long id;
38 38  
39 39 @AssertTrue(message = "上级菜单不能为空,请前往 [修改生成配置 -> 生成信息] 界面,设置“上级菜单”字段")
... ... @@ -51,7 +51,7 @@ public class CodegenUpdateReqVO {
51 51 @ToString(callSuper = true)
52 52 public static class Column extends CodegenColumnBaseVO {
53 53  
54   - @Schema(description = "编号", required = true, example = "1")
  54 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
55 55 private Long id;
56 56  
57 57 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java
1 1 package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.column;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.Data;
4 5  
... ... @@ -11,43 +12,43 @@ import javax.validation.constraints.NotNull;
11 12 @Data
12 13 public class CodegenColumnBaseVO {
13 14  
14   - @Schema(description = "表编号", required = true, example = "1")
  15 + @Schema(description = "表编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
15 16 @NotNull(message = "表编号不能为空")
16 17 private Long tableId;
17 18  
18   - @Schema(description = "字段名", required = true, example = "user_age")
  19 + @Schema(description = "字段名", requiredMode = Schema.RequiredMode.REQUIRED, example = "user_age")
19 20 @NotNull(message = "字段名不能为空")
20 21 private String columnName;
21 22  
22   - @Schema(description = "字段类型", required = true, example = "int(11)")
  23 + @Schema(description = "字段类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "int(11)")
23 24 @NotNull(message = "字段类型不能为空")
24 25 private String dataType;
25 26  
26   - @Schema(description = "字段描述", required = true, example = "年龄")
  27 + @Schema(description = "字段描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "年龄")
27 28 @NotNull(message = "字段描述不能为空")
28 29 private String columnComment;
29 30  
30   - @Schema(description = "是否允许为空", required = true, example = "true")
  31 + @Schema(description = "是否允许为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
31 32 @NotNull(message = "是否允许为空不能为空")
32 33 private Boolean nullable;
33 34  
34   - @Schema(description = "是否主键", required = true, example = "false")
  35 + @Schema(description = "是否主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
35 36 @NotNull(message = "是否主键不能为空")
36 37 private Boolean primaryKey;
37 38  
38   - @Schema(description = "是否自增", required = true, example = "true")
  39 + @Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
39 40 @NotNull(message = "是否自增不能为空")
40 41 private String autoIncrement;
41 42  
42   - @Schema(description = "排序", required = true, example = "10")
  43 + @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
43 44 @NotNull(message = "排序不能为空")
44 45 private Integer ordinalPosition;
45 46  
46   - @Schema(description = "Java 属性类型", required = true, example = "userAge")
  47 + @Schema(description = "Java 属性类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "userAge")
47 48 @NotNull(message = "Java 属性类型不能为空")
48 49 private String javaType;
49 50  
50   - @Schema(description = "Java 属性名", required = true, example = "Integer")
  51 + @Schema(description = "Java 属性名", requiredMode = Schema.RequiredMode.REQUIRED, example = "Integer")
51 52 @NotNull(message = "Java 属性名不能为空")
52 53 private String javaField;
53 54  
... ... @@ -57,27 +58,27 @@ public class CodegenColumnBaseVO {
57 58 @Schema(description = "数据示例", example = "1024")
58 59 private String example;
59 60  
60   - @Schema(description = "是否为 Create 创建操作的字段", required = true, example = "true")
  61 + @Schema(description = "是否为 Create 创建操作的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
61 62 @NotNull(message = "是否为 Create 创建操作的字段不能为空")
62 63 private Boolean createOperation;
63 64  
64   - @Schema(description = "是否为 Update 更新操作的字段", required = true, example = "false")
  65 + @Schema(description = "是否为 Update 更新操作的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
65 66 @NotNull(message = "是否为 Update 更新操作的字段不能为空")
66 67 private Boolean updateOperation;
67 68  
68   - @Schema(description = "是否为 List 查询操作的字段", required = true, example = "true")
  69 + @Schema(description = "是否为 List 查询操作的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
69 70 @NotNull(message = "是否为 List 查询操作的字段不能为空")
70 71 private Boolean listOperation;
71 72  
72   - @Schema(description = "List 查询操作的条件类型,参见 CodegenColumnListConditionEnum 枚举", required = true, example = "LIKE")
  73 + @Schema(description = "List 查询操作的条件类型,参见 CodegenColumnListConditionEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "LIKE")
73 74 @NotNull(message = "List 查询操作的条件类型不能为空")
74 75 private String listOperationCondition;
75 76  
76   - @Schema(description = "是否为 List 查询操作的返回字段", required = true, example = "true")
  77 + @Schema(description = "是否为 List 查询操作的返回字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
77 78 @NotNull(message = "是否为 List 查询操作的返回字段不能为空")
78 79 private Boolean listOperationResult;
79 80  
80   - @Schema(description = "显示类型", required = true, example = "input")
  81 + @Schema(description = "显示类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "input")
81 82 @NotNull(message = "显示类型不能为空")
82 83 private String htmlType;
83 84  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java
... ... @@ -13,10 +13,10 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class CodegenColumnRespVO extends CodegenColumnBaseVO {
15 15  
16   - @Schema(description = "编号", required = true, example = "1")
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
17 17 private Long id;
18 18  
19   - @Schema(description = "创建时间", required = true)
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private LocalDateTime createTime;
21 21  
22 22 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableBaseVO.java
1 1 package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.Data;
4 5  
5 6 import javax.validation.constraints.NotNull;
6 7  
7 8 /**
8   - * 代码生成 Base VO,提供给添加、修改、详细的子 VO 使用
9   - * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
10   - */
  9 + * 代码生成 Base VO,提供给添加、修改、详细的子 VO 使用
  10 + * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
  11 + */
11 12 @Data
12 13 public class CodegenTableBaseVO {
13 14  
14   - @Schema(description = "生成场景,参见 CodegenSceneEnum 枚举", required = true, example = "1")
  15 + @Schema(description = "生成场景,参见 CodegenSceneEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
15 16 @NotNull(message = "导入类型不能为空")
16 17 private Integer scene;
17 18  
18   - @Schema(description = "表名称", required = true, example = "yudao")
  19 + @Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao")
19 20 @NotNull(message = "表名称不能为空")
20 21 private String tableName;
21 22  
22   - @Schema(description = "表描述", required = true, example = "芋道")
  23 + @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
23 24 @NotNull(message = "表描述不能为空")
24 25 private String tableComment;
25 26  
26 27 @Schema(description = "备注", example = "我是备注")
27 28 private String remark;
28 29  
29   - @Schema(description = "模块名", required = true, example = "system")
  30 + @Schema(description = "模块名", requiredMode = Schema.RequiredMode.REQUIRED, example = "system")
30 31 @NotNull(message = "模块名不能为空")
31 32 private String moduleName;
32 33  
33   - @Schema(description = "业务名", required = true, example = "codegen")
  34 + @Schema(description = "业务名", requiredMode = Schema.RequiredMode.REQUIRED, example = "codegen")
34 35 @NotNull(message = "业务名不能为空")
35 36 private String businessName;
36 37  
37   - @Schema(description = "类名称", required = true, example = "CodegenTable")
  38 + @Schema(description = "类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "CodegenTable")
38 39 @NotNull(message = "类名称不能为空")
39 40 private String className;
40 41  
41   - @Schema(description = "类描述", required = true, example = "代码生成器的表定义")
  42 + @Schema(description = "类描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "代码生成器的表定义")
42 43 @NotNull(message = "类描述不能为空")
43 44 private String classComment;
44 45  
45   - @Schema(description = "作者", required = true, example = "芋道源码")
  46 + @Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
46 47 @NotNull(message = "作者不能为空")
47 48 private String author;
48 49  
49   - @Schema(description = "模板类型,参见 CodegenTemplateTypeEnum 枚举", required = true, example = "1")
  50 + @Schema(description = "模板类型,参见 CodegenTemplateTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
50 51 @NotNull(message = "模板类型不能为空")
51 52 private Integer templateType;
52 53  
53   - @Schema(description = "前端类型,参见 CodegenFrontTypeEnum 枚举", required = true, example = "20")
  54 + @Schema(description = "前端类型,参见 CodegenFrontTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
54 55 @NotNull(message = "前端类型不能为空")
55 56 private Integer frontType;
56 57  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java
... ... @@ -13,16 +13,16 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class CodegenTableRespVO extends CodegenTableBaseVO {
15 15  
16   - @Schema(description = "编号", required = true, example = "1")
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
17 17 private Long id;
18 18  
19   - @Schema(description = "主键编号", required = true, example = "1024")
  19 + @Schema(description = "主键编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
20 20 private Integer dataSourceConfigId;
21 21  
22   - @Schema(description = "创建时间", required = true)
  22 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
23 23 private LocalDateTime createTime;
24 24  
25   - @Schema(description = "更新时间", required = true)
  25 + @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
26 26 private LocalDateTime updateTime;
27 27  
28 28 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java
... ... @@ -7,10 +7,10 @@ import lombok.Data;
7 7 @Data
8 8 public class DatabaseTableRespVO {
9 9  
10   - @Schema(description = "表名称", required = true, example = "yuanma")
  10 + @Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "yuanma")
11 11 private String name;
12 12  
13   - @Schema(description = "表描述", required = true, example = "芋道源码")
  13 + @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
14 14 private String comment;
15 15  
16 16 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigBaseVO.java
1 1 package cn.iocoder.yudao.module.infra.controller.admin.config.vo;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.Data;
4 5  
... ... @@ -14,22 +15,22 @@ import javax.validation.constraints.Size;
14 15 @Data
15 16 public class ConfigBaseVO {
16 17  
17   - @Schema(description = "参数分组", required = true, example = "biz")
  18 + @Schema(description = "参数分组", requiredMode = Schema.RequiredMode.REQUIRED, example = "biz")
18 19 @NotEmpty(message = "参数分组不能为空")
19 20 @Size(max = 50, message = "参数名称不能超过50个字符")
20 21 private String category;
21 22  
22   - @Schema(description = "参数名称", required = true, example = "数据库名")
  23 + @Schema(description = "参数名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "数据库名")
23 24 @NotBlank(message = "参数名称不能为空")
24 25 @Size(max = 100, message = "参数名称不能超过100个字符")
25 26 private String name;
26 27  
27   - @Schema(description = "参数键值", required = true, example = "1024")
  28 + @Schema(description = "参数键值", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
28 29 @NotBlank(message = "参数键值不能为空")
29 30 @Size(max = 500, message = "参数键值长度不能超过500个字符")
30 31 private String value;
31 32  
32   - @Schema(description = "是否可见", required = true, example = "true")
  33 + @Schema(description = "是否可见", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
33 34 @NotNull(message = "是否可见不能为空")
34 35 private Boolean visible;
35 36  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigCreateReqVO.java
... ... @@ -12,7 +12,7 @@ import javax.validation.constraints.Size;
12 12 @EqualsAndHashCode(callSuper = true)
13 13 public class ConfigCreateReqVO extends ConfigBaseVO {
14 14  
15   - @Schema(description = "参数键名", required = true, example = "yunai.db.username")
  15 + @Schema(description = "参数键名", requiredMode = Schema.RequiredMode.REQUIRED, example = "yunai.db.username")
16 16 @NotBlank(message = "参数键名长度不能为空")
17 17 @Size(max = 100, message = "参数键名长度不能超过100个字符")
18 18 private String key;
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigRespVO.java
... ... @@ -13,18 +13,18 @@ import java.time.LocalDateTime;
13 13 @EqualsAndHashCode(callSuper = true)
14 14 public class ConfigRespVO extends ConfigBaseVO {
15 15  
16   - @Schema(description = "参数配置序号", required = true, example = "1024")
  16 + @Schema(description = "参数配置序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 private Long id;
18 18  
19   - @Schema(description = "参数键名", required = true, example = "yunai.db.username")
  19 + @Schema(description = "参数键名", requiredMode = Schema.RequiredMode.REQUIRED, example = "yunai.db.username")
20 20 @NotBlank(message = "参数键名长度不能为空")
21 21 @Size(max = 100, message = "参数键名长度不能超过100个字符")
22 22 private String key;
23 23  
24   - @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", required = true, example = "1")
  24 + @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
25 25 private Integer type;
26 26  
27   - @Schema(description = "创建时间", required = true, example = "时间戳格式")
  27 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
28 28 private LocalDateTime createTime;
29 29  
30 30 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigUpdateReqVO.java
... ... @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
13 13 @ToString(callSuper = true)
14 14 public class ConfigUpdateReqVO extends ConfigBaseVO {
15 15  
16   - @Schema(description = "参数配置序号", required = true, example = "1024")
  16 + @Schema(description = "参数配置序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 @NotNull(message = "参数配置编号不能为空")
18 18 private Long id;
19 19  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigBaseVO.java
... ... @@ -10,15 +10,15 @@ import javax.validation.constraints.*;
10 10 @Data
11 11 public class DataSourceConfigBaseVO {
12 12  
13   - @Schema(description = "数据源名称", required = true, example = "test")
  13 + @Schema(description = "数据源名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "test")
14 14 @NotNull(message = "数据源名称不能为空")
15 15 private String name;
16 16  
17   - @Schema(description = "数据源连接", required = true, example = "jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro")
  17 + @Schema(description = "数据源连接", requiredMode = Schema.RequiredMode.REQUIRED, example = "jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro")
18 18 @NotNull(message = "数据源连接不能为空")
19 19 private String url;
20 20  
21   - @Schema(description = "用户名", required = true, example = "root")
  21 + @Schema(description = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "root")
22 22 @NotNull(message = "用户名不能为空")
23 23 private String username;
24 24  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigCreateReqVO.java
1 1 package cn.iocoder.yudao.module.infra.controller.admin.db.vo;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.*;
4 5 import javax.validation.constraints.*;
... ... @@ -9,7 +10,7 @@ import javax.validation.constraints.*;
9 10 @ToString(callSuper = true)
10 11 public class DataSourceConfigCreateReqVO extends DataSourceConfigBaseVO {
11 12  
12   - @Schema(description = "密码", required = true, example = "123456")
  13 + @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
13 14 @NotNull(message = "密码不能为空")
14 15 private String password;
15 16  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java
1 1 package cn.iocoder.yudao.module.infra.controller.admin.db.vo;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.*;
4 5  
... ... @@ -10,10 +11,10 @@ import java.time.LocalDateTime;
10 11 @ToString(callSuper = true)
11 12 public class DataSourceConfigRespVO extends DataSourceConfigBaseVO {
12 13  
13   - @Schema(description = "主键编号", required = true, example = "1024")
  14 + @Schema(description = "主键编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
14 15 private Integer id;
15 16  
16   - @Schema(description = "创建时间", required = true)
  17 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
17 18 private LocalDateTime createTime;
18 19  
19 20 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigUpdateReqVO.java
1 1 package cn.iocoder.yudao.module.infra.controller.admin.db.vo;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.*;
4 5 import javax.validation.constraints.*;
... ... @@ -9,11 +10,11 @@ import javax.validation.constraints.*;
9 10 @ToString(callSuper = true)
10 11 public class DataSourceConfigUpdateReqVO extends DataSourceConfigBaseVO {
11 12  
12   - @Schema(description = "主键编号", required = true, example = "1024")
  13 + @Schema(description = "主键编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 14 @NotNull(message = "主键编号不能为空")
14 15 private Long id;
15 16  
16   - @Schema(description = "密码", required = true, example = "123456")
  17 + @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
17 18 @NotNull(message = "密码不能为空")
18 19 private String password;
19 20  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigBaseVO.java
1 1 package cn.iocoder.yudao.module.infra.controller.admin.file.vo.config;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.Data;
4 5  
... ... @@ -11,7 +12,7 @@ import javax.validation.constraints.NotNull;
11 12 @Data
12 13 public class FileConfigBaseVO {
13 14  
14   - @Schema(description = "配置名", required = true, example = "S3 - 阿里云")
  15 + @Schema(description = "配置名", requiredMode = Schema.RequiredMode.REQUIRED, example = "S3 - 阿里云")
15 16 @NotNull(message = "配置名不能为空")
16 17 private String name;
17 18  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java
... ... @@ -14,11 +14,11 @@ import java.util.Map;
14 14 @ToString(callSuper = true)
15 15 public class FileConfigCreateReqVO extends FileConfigBaseVO {
16 16  
17   - @Schema(description = "存储器,参见 FileStorageEnum 枚举类参见 FileStorageEnum 枚举类", required = true, example = "1")
  17 + @Schema(description = "存储器,参见 FileStorageEnum 枚举类参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
18 18 @NotNull(message = "存储器不能为空")
19 19 private Integer storage;
20 20  
21   - @Schema(description = "存储配置,配置是动态参数,所以使用 Map 接收", required = true)
  21 + @Schema(description = "存储配置,配置是动态参数,所以使用 Map 接收", requiredMode = Schema.RequiredMode.REQUIRED)
22 22 @NotNull(message = "存储配置不能为空")
23 23 private Map<String, Object> config;
24 24  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java
... ... @@ -15,21 +15,21 @@ import java.time.LocalDateTime;
15 15 @ToString(callSuper = true)
16 16 public class FileConfigRespVO extends FileConfigBaseVO {
17 17  
18   - @Schema(description = "编号", required = true, example = "1")
  18 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
19 19 private Long id;
20 20  
21   - @Schema(description = "存储器,参见 FileStorageEnum 枚举类", required = true, example = "1")
  21 + @Schema(description = "存储器,参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
22 22 @NotNull(message = "存储器不能为空")
23 23 private Integer storage;
24 24  
25   - @Schema(description = "是否为主配置", required = true, example = "true")
  25 + @Schema(description = "是否为主配置", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
26 26 @NotNull(message = "是否为主配置不能为空")
27 27 private Boolean master;
28 28  
29   - @Schema(description = "存储配置", required = true)
  29 + @Schema(description = "存储配置", requiredMode = Schema.RequiredMode.REQUIRED)
30 30 private FileClientConfig config;
31 31  
32   - @Schema(description = "创建时间", required = true)
  32 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
33 33 private LocalDateTime createTime;
34 34  
35 35 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigUpdateReqVO.java
... ... @@ -14,11 +14,11 @@ import java.util.Map;
14 14 @ToString(callSuper = true)
15 15 public class FileConfigUpdateReqVO extends FileConfigBaseVO {
16 16  
17   - @Schema(description = "编号", required = true, example = "1")
  17 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
18 18 @NotNull(message = "编号不能为空")
19 19 private Long id;
20 20  
21   - @Schema(description = "存储配置,配置是动态参数,所以使用 Map 接收", required = true)
  21 + @Schema(description = "存储配置,配置是动态参数,所以使用 Map 接收", requiredMode = Schema.RequiredMode.REQUIRED)
22 22 @NotNull(message = "存储配置不能为空")
23 23 private Map<String, Object> config;
24 24  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileRespVO.java
... ... @@ -9,28 +9,28 @@ import java.time.LocalDateTime;
9 9 @Data
10 10 public class FileRespVO {
11 11  
12   - @Schema(description = "文件编号", required = true, example = "1024")
  12 + @Schema(description = "文件编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 13 private Long id;
14 14  
15   - @Schema(description = "配置编号", required = true, example = "11")
  15 + @Schema(description = "配置编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
16 16 private Long configId;
17 17  
18   - @Schema(description = "文件路径", required = true, example = "yudao.jpg")
  18 + @Schema(description = "文件路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao.jpg")
19 19 private String path;
20 20  
21   - @Schema(description = "原文件名", required = true, example = "yudao.jpg")
  21 + @Schema(description = "原文件名", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao.jpg")
22 22 private String name;
23 23  
24   - @Schema(description = "文件 URL", required = true, example = "https://www.iocoder.cn/yudao.jpg")
  24 + @Schema(description = "文件 URL", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/yudao.jpg")
25 25 private String url;
26 26  
27 27 @Schema(description = "文件MIME类型", example = "application/octet-stream")
28 28 private String type;
29 29  
30   - @Schema(description = "文件大小", example = "2048", required = true)
  30 + @Schema(description = "文件大小", example = "2048", requiredMode = Schema.RequiredMode.REQUIRED)
31 31 private Integer size;
32 32  
33   - @Schema(description = "创建时间", required = true)
  33 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
34 34 private LocalDateTime createTime;
35 35  
36 36 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java
... ... @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
10 10 @Data
11 11 public class FileUploadReqVO {
12 12  
13   - @Schema(description = "文件附件", required = true)
  13 + @Schema(description = "文件附件", requiredMode = Schema.RequiredMode.REQUIRED)
14 14 @NotNull(message = "文件附件不能为空")
15 15 private MultipartFile file;
16 16  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobBaseVO.java
1 1 package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.Data;
4 5  
... ... @@ -11,22 +12,22 @@ import javax.validation.constraints.NotNull;
11 12 @Data
12 13 public class JobBaseVO {
13 14  
14   - @Schema(description = "任务名称", required = true, example = "测试任务")
  15 + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试任务")
15 16 @NotNull(message = "任务名称不能为空")
16 17 private String name;
17 18  
18 19 @Schema(description = "处理器的参数", example = "yudao")
19 20 private String handlerParam;
20 21  
21   - @Schema(description = "CRON 表达式", required = true, example = "0/10 * * * * ? *")
  22 + @Schema(description = "CRON 表达式", requiredMode = Schema.RequiredMode.REQUIRED, example = "0/10 * * * * ? *")
22 23 @NotNull(message = "CRON 表达式不能为空")
23 24 private String cronExpression;
24 25  
25   - @Schema(description = "重试次数", required = true, example = "3")
  26 + @Schema(description = "重试次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "3")
26 27 @NotNull(message = "重试次数不能为空")
27 28 private Integer retryCount;
28 29  
29   - @Schema(description = "重试间隔", required = true, example = "1000")
  30 + @Schema(description = "重试间隔", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
30 31 @NotNull(message = "重试间隔不能为空")
31 32 private Integer retryInterval;
32 33  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobCreateReqVO.java
... ... @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
13 13 @ToString(callSuper = true)
14 14 public class JobCreateReqVO extends JobBaseVO {
15 15  
16   - @Schema(description = "处理器的名字", required = true, example = "sysUserSessionTimeoutJob")
  16 + @Schema(description = "处理器的名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "sysUserSessionTimeoutJob")
17 17 @NotNull(message = "处理器的名字不能为空")
18 18 private String handlerName;
19 19  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobRespVO.java
... ... @@ -14,17 +14,17 @@ import java.time.LocalDateTime;
14 14 @ToString(callSuper = true)
15 15 public class JobRespVO extends JobBaseVO {
16 16  
17   - @Schema(description = "任务编号", required = true, example = "1024")
  17 + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
18 18 private Long id;
19 19  
20   - @Schema(description = "任务状态", required = true, example = "1")
  20 + @Schema(description = "任务状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
21 21 private Integer status;
22 22  
23   - @Schema(description = "处理器的名字", required = true, example = "sysUserSessionTimeoutJob")
  23 + @Schema(description = "处理器的名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "sysUserSessionTimeoutJob")
24 24 @NotNull(message = "处理器的名字不能为空")
25 25 private String handlerName;
26 26  
27   - @Schema(description = "创建时间", required = true)
  27 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
28 28 private LocalDateTime createTime;
29 29  
30 30 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobUpdateReqVO.java
... ... @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
13 13 @ToString(callSuper = true)
14 14 public class JobUpdateReqVO extends JobBaseVO {
15 15  
16   - @Schema(description = "任务编号", required = true, example = "1024")
  16 + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 @NotNull(message = "任务编号不能为空")
18 18 private Long id;
19 19  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/JobLogBaseVO.java
1 1 package cn.iocoder.yudao.module.infra.controller.admin.job.vo.log;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.Data;
4 5 import org.springframework.format.annotation.DateTimeFormat;
... ... @@ -15,22 +16,22 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
15 16 @Data
16 17 public class JobLogBaseVO {
17 18  
18   - @Schema(description = "任务编号", required = true, example = "1024")
  19 + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
19 20 @NotNull(message = "任务编号不能为空")
20 21 private Long jobId;
21 22  
22   - @Schema(description = "处理器的名字", required = true, example = "sysUserSessionTimeoutJob")
  23 + @Schema(description = "处理器的名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "sysUserSessionTimeoutJob")
23 24 @NotNull(message = "处理器的名字不能为空")
24 25 private String handlerName;
25 26  
26 27 @Schema(description = "处理器的参数", example = "yudao")
27 28 private String handlerParam;
28 29  
29   - @Schema(description = "第几次执行", required = true, example = "1")
  30 + @Schema(description = "第几次执行", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
30 31 @NotNull(message = "第几次执行不能为空")
31 32 private Integer executeIndex;
32 33  
33   - @Schema(description = "开始执行时间", required = true)
  34 + @Schema(description = "开始执行时间", requiredMode = Schema.RequiredMode.REQUIRED)
34 35 @NotNull(message = "开始执行时间不能为空")
35 36 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
36 37 private LocalDateTime beginTime;
... ... @@ -42,7 +43,7 @@ public class JobLogBaseVO {
42 43 @Schema(description = "执行时长", example = "123")
43 44 private Integer duration;
44 45  
45   - @Schema(description = "任务状态,参见 JobLogStatusEnum 枚举", required = true, example = "1")
  46 + @Schema(description = "任务状态,参见 JobLogStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
46 47 @NotNull(message = "任务状态不能为空")
47 48 private Integer status;
48 49  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/JobLogRespVO.java
... ... @@ -13,10 +13,10 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class JobLogRespVO extends JobLogBaseVO {
15 15  
16   - @Schema(description = "日志编号", required = true, example = "1024")
  16 + @Schema(description = "日志编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 private Long id;
18 18  
19   - @Schema(description = "创建时间", required = true)
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private LocalDateTime createTime;
21 21  
22 22 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogBaseVO.java
1 1 package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog;
  2 +
2 3 import io.swagger.v3.oas.annotations.media.Schema;
3 4 import lombok.Data;
4 5 import org.springframework.format.annotation.DateTimeFormat;
... ... @@ -15,56 +16,56 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
15 16 @Data
16 17 public class ApiAccessLogBaseVO {
17 18  
18   - @Schema(description = "链路追踪编号", required = true, example = "66600cb6-7852-11eb-9439-0242ac130002")
  19 + @Schema(description = "链路追踪编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "66600cb6-7852-11eb-9439-0242ac130002")
19 20 @NotNull(message = "链路追踪编号不能为空")
20 21 private String traceId;
21 22  
22   - @Schema(description = "用户编号", required = true, example = "666")
  23 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
23 24 @NotNull(message = "用户编号不能为空")
24 25 private Long userId;
25 26  
26   - @Schema(description = "用户类型,参见 UserTypeEnum 枚举", required = true, example = "2")
  27 + @Schema(description = "用户类型,参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
27 28 @NotNull(message = "用户类型不能为空")
28 29 private Integer userType;
29 30  
30   - @Schema(description = "应用名", required = true, example = "dashboard")
  31 + @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "dashboard")
31 32 @NotNull(message = "应用名不能为空")
32 33 private String applicationName;
33 34  
34   - @Schema(description = "请求方法名", required = true, example = "GET")
  35 + @Schema(description = "请求方法名", requiredMode = Schema.RequiredMode.REQUIRED, example = "GET")
35 36 @NotNull(message = "请求方法名不能为空")
36 37 private String requestMethod;
37 38  
38   - @Schema(description = "请求地址", required = true, example = "/xxx/yyy")
  39 + @Schema(description = "请求地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "/xxx/yyy")
39 40 @NotNull(message = "请求地址不能为空")
40 41 private String requestUrl;
41 42  
42 43 @Schema(description = "请求参数")
43 44 private String requestParams;
44 45  
45   - @Schema(description = "用户 IP", required = true, example = "127.0.0.1")
  46 + @Schema(description = "用户 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1")
46 47 @NotNull(message = "用户 IP不能为空")
47 48 private String userIp;
48 49  
49   - @Schema(description = "浏览器 UA", required = true, example = "Mozilla/5.0")
  50 + @Schema(description = "浏览器 UA", requiredMode = Schema.RequiredMode.REQUIRED, example = "Mozilla/5.0")
50 51 @NotNull(message = "浏览器 UA不能为空")
51 52 private String userAgent;
52 53  
53   - @Schema(description = "开始请求时间", required = true)
  54 + @Schema(description = "开始请求时间", requiredMode = Schema.RequiredMode.REQUIRED)
54 55 @NotNull(message = "开始请求时间不能为空")
55 56 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
56 57 private LocalDateTime beginTime;
57 58  
58   - @Schema(description = "结束请求时间", required = true)
  59 + @Schema(description = "结束请求时间", requiredMode = Schema.RequiredMode.REQUIRED)
59 60 @NotNull(message = "结束请求时间不能为空")
60 61 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
61 62 private LocalDateTime endTime;
62 63  
63   - @Schema(description = "执行时长", required = true, example = "100")
  64 + @Schema(description = "执行时长", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
64 65 @NotNull(message = "执行时长不能为空")
65 66 private Integer duration;
66 67  
67   - @Schema(description = "结果码", required = true, example = "0")
  68 + @Schema(description = "结果码", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
68 69 @NotNull(message = "结果码不能为空")
69 70 private Integer resultCode;
70 71  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java
... ... @@ -13,10 +13,10 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class ApiAccessLogRespVO extends ApiAccessLogBaseVO {
15 15  
16   - @Schema(description = "日志主键", required = true, example = "1024")
  16 + @Schema(description = "日志主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 private Long id;
18 18  
19   - @Schema(description = "创建时间", required = true)
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private LocalDateTime createTime;
21 21  
22 22 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogBaseVO.java
... ... @@ -15,80 +15,80 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
15 15 @Data
16 16 public class ApiErrorLogBaseVO {
17 17  
18   - @Schema(description = "链路追踪编号", required = true, example = "66600cb6-7852-11eb-9439-0242ac130002")
  18 + @Schema(description = "链路追踪编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "66600cb6-7852-11eb-9439-0242ac130002")
19 19 @NotNull(message = "链路追踪编号不能为空")
20 20 private String traceId;
21 21  
22   - @Schema(description = "用户编号", required = true, example = "666")
  22 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
23 23 @NotNull(message = "用户编号不能为空")
24 24 private Integer userId;
25 25  
26   - @Schema(description = "用户类型", required = true, example = "1")
  26 + @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
27 27 @NotNull(message = "用户类型不能为空")
28 28 private Integer userType;
29 29  
30   - @Schema(description = "应用名", required = true, example = "dashboard")
  30 + @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "dashboard")
31 31 @NotNull(message = "应用名不能为空")
32 32 private String applicationName;
33 33  
34   - @Schema(description = "请求方法名", required = true, example = "GET")
  34 + @Schema(description = "请求方法名", requiredMode = Schema.RequiredMode.REQUIRED, example = "GET")
35 35 @NotNull(message = "请求方法名不能为空")
36 36 private String requestMethod;
37 37  
38   - @Schema(description = "请求地址", required = true, example = "/xx/yy")
  38 + @Schema(description = "请求地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "/xx/yy")
39 39 @NotNull(message = "请求地址不能为空")
40 40 private String requestUrl;
41 41  
42   - @Schema(description = "请求参数", required = true)
  42 + @Schema(description = "请求参数", requiredMode = Schema.RequiredMode.REQUIRED)
43 43 @NotNull(message = "请求参数不能为空")
44 44 private String requestParams;
45 45  
46   - @Schema(description = "用户 IP", required = true, example = "127.0.0.1")
  46 + @Schema(description = "用户 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1")
47 47 @NotNull(message = "用户 IP不能为空")
48 48 private String userIp;
49 49  
50   - @Schema(description = "浏览器 UA", required = true, example = "Mozilla/5.0")
  50 + @Schema(description = "浏览器 UA", requiredMode = Schema.RequiredMode.REQUIRED, example = "Mozilla/5.0")
51 51 @NotNull(message = "浏览器 UA不能为空")
52 52 private String userAgent;
53 53  
54   - @Schema(description = "异常发生时间", required = true)
  54 + @Schema(description = "异常发生时间", requiredMode = Schema.RequiredMode.REQUIRED)
55 55 @NotNull(message = "异常发生时间不能为空")
56 56 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
57 57 private LocalDateTime exceptionTime;
58 58  
59   - @Schema(description = "异常名", required = true)
  59 + @Schema(description = "异常名", requiredMode = Schema.RequiredMode.REQUIRED)
60 60 @NotNull(message = "异常名不能为空")
61 61 private String exceptionName;
62 62  
63   - @Schema(description = "异常导致的消息", required = true)
  63 + @Schema(description = "异常导致的消息", requiredMode = Schema.RequiredMode.REQUIRED)
64 64 @NotNull(message = "异常导致的消息不能为空")
65 65 private String exceptionMessage;
66 66  
67   - @Schema(description = "异常导致的根消息", required = true)
  67 + @Schema(description = "异常导致的根消息", requiredMode = Schema.RequiredMode.REQUIRED)
68 68 @NotNull(message = "异常导致的根消息不能为空")
69 69 private String exceptionRootCauseMessage;
70 70  
71   - @Schema(description = "异常的栈轨迹", required = true)
  71 + @Schema(description = "异常的栈轨迹", requiredMode = Schema.RequiredMode.REQUIRED)
72 72 @NotNull(message = "异常的栈轨迹不能为空")
73 73 private String exceptionStackTrace;
74 74  
75   - @Schema(description = "异常发生的类全名", required = true)
  75 + @Schema(description = "异常发生的类全名", requiredMode = Schema.RequiredMode.REQUIRED)
76 76 @NotNull(message = "异常发生的类全名不能为空")
77 77 private String exceptionClassName;
78 78  
79   - @Schema(description = "异常发生的类文件", required = true)
  79 + @Schema(description = "异常发生的类文件", requiredMode = Schema.RequiredMode.REQUIRED)
80 80 @NotNull(message = "异常发生的类文件不能为空")
81 81 private String exceptionFileName;
82 82  
83   - @Schema(description = "异常发生的方法名", required = true)
  83 + @Schema(description = "异常发生的方法名", requiredMode = Schema.RequiredMode.REQUIRED)
84 84 @NotNull(message = "异常发生的方法名不能为空")
85 85 private String exceptionMethodName;
86 86  
87   - @Schema(description = "异常发生的方法所在行", required = true)
  87 + @Schema(description = "异常发生的方法所在行", requiredMode = Schema.RequiredMode.REQUIRED)
88 88 @NotNull(message = "异常发生的方法所在行不能为空")
89 89 private Integer exceptionLineNumber;
90 90  
91   - @Schema(description = "处理状态", required = true, example = "0")
  91 + @Schema(description = "处理状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
92 92 @NotNull(message = "处理状态不能为空")
93 93 private Integer processStatus;
94 94  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java
... ... @@ -13,13 +13,13 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class ApiErrorLogRespVO extends ApiErrorLogBaseVO {
15 15  
16   - @Schema(description = "编号", required = true, example = "1024")
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 private Integer id;
18 18  
19   - @Schema(description = "创建时间", required = true)
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private LocalDateTime createTime;
21 21  
22   - @Schema(description = "处理时间", required = true)
  22 + @Schema(description = "处理时间", requiredMode = Schema.RequiredMode.REQUIRED)
23 23 private LocalDateTime processTime;
24 24  
25 25 @Schema(description = "处理用户编号", example = "233")
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyDefineRespVO.java
... ... @@ -14,22 +14,22 @@ import java.time.Duration;
14 14 @AllArgsConstructor
15 15 public class RedisKeyDefineRespVO {
16 16  
17   - @Schema(description = "Key 模板", required = true, example = "login_user:%s")
  17 + @Schema(description = "Key 模板", requiredMode = Schema.RequiredMode.REQUIRED, example = "login_user:%s")
18 18 private String keyTemplate;
19 19  
20   - @Schema(description = "Key 类型的枚举", required = true, example = "String")
  20 + @Schema(description = "Key 类型的枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
21 21 private RedisKeyDefine.KeyTypeEnum keyType;
22 22  
23   - @Schema(description = "Value 类型", required = true, example = "java.lang.String")
  23 + @Schema(description = "Value 类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "java.lang.String")
24 24 private Class<?> valueType;
25 25  
26   - @Schema(description = "超时类型", required = true, example = "1")
  26 + @Schema(description = "超时类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
27 27 private RedisKeyDefine.TimeoutTypeEnum timeoutType;
28 28  
29   - @Schema(description = "过期时间,单位:毫秒", required = true, example = "1024")
  29 + @Schema(description = "过期时间,单位:毫秒", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
30 30 private Duration timeout;
31 31  
32   - @Schema(description = "备注", required = true, example = "啦啦啦啦~")
  32 + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "啦啦啦啦~")
33 33 private String memo;
34 34  
35 35 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyValueRespVO.java
... ... @@ -9,10 +9,10 @@ import lombok.Data;
9 9 @AllArgsConstructor
10 10 public class RedisKeyValueRespVO {
11 11  
12   - @Schema(description = "c5f6990767804a928f4bb96ca249febf", required = true, example = "String")
  12 + @Schema(description = "c5f6990767804a928f4bb96ca249febf", requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
13 13 private String key;
14 14  
15   - @Schema(required = true, example = "String")
  15 + @Schema(requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
16 16 private String value;
17 17  
18 18 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java
... ... @@ -14,13 +14,13 @@ import java.util.Properties;
14 14 @AllArgsConstructor
15 15 public class RedisMonitorRespVO {
16 16  
17   - @Schema(description = "Redis info 指令结果,具体字段,查看 Redis 文档", required = true)
  17 + @Schema(description = "Redis info 指令结果,具体字段,查看 Redis 文档", requiredMode = Schema.RequiredMode.REQUIRED)
18 18 private Properties info;
19 19  
20   - @Schema(description = "Redis key 数量", required = true, example = "1024")
  20 + @Schema(description = "Redis key 数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
21 21 private Long dbSize;
22 22  
23   - @Schema(description = "CommandStat 数组", required = true)
  23 + @Schema(description = "CommandStat 数组", requiredMode = Schema.RequiredMode.REQUIRED)
24 24 private List<CommandStat> commandStats;
25 25  
26 26 @Schema(description = "Redis 命令统计结果")
... ... @@ -29,13 +29,13 @@ public class RedisMonitorRespVO {
29 29 @AllArgsConstructor
30 30 public static class CommandStat {
31 31  
32   - @Schema(description = "Redis 命令", required = true, example = "get")
  32 + @Schema(description = "Redis 命令", requiredMode = Schema.RequiredMode.REQUIRED, example = "get")
33 33 private String command;
34 34  
35   - @Schema(description = "调用次数", required = true, example = "1024")
  35 + @Schema(description = "调用次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
36 36 private Long calls;
37 37  
38   - @Schema(description = "消耗 CPU 秒数", required = true, example = "666")
  38 + @Schema(description = "消耗 CPU 秒数", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
39 39 private Long usec;
40 40  
41 41 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoBaseVO.java
... ... @@ -10,19 +10,19 @@ import javax.validation.constraints.*;
10 10 @Data
11 11 public class TestDemoBaseVO {
12 12  
13   - @Schema(description = "名字", required = true)
  13 + @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED)
14 14 @NotNull(message = "名字不能为空")
15 15 private String name;
16 16  
17   - @Schema(description = "状态", required = true)
  17 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED)
18 18 @NotNull(message = "状态不能为空")
19 19 private Integer status;
20 20  
21   - @Schema(description = "类型", required = true)
  21 + @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED)
22 22 @NotNull(message = "类型不能为空")
23 23 private Integer type;
24 24  
25   - @Schema(description = "分类", required = true)
  25 + @Schema(description = "分类", requiredMode = Schema.RequiredMode.REQUIRED)
26 26 @NotNull(message = "分类不能为空")
27 27 private Integer category;
28 28  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoRespVO.java
... ... @@ -10,10 +10,10 @@ import java.time.LocalDateTime;
10 10 @ToString(callSuper = true)
11 11 public class TestDemoRespVO extends TestDemoBaseVO {
12 12  
13   - @Schema(description = "编号", required = true)
  13 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
14 14 private Long id;
15 15  
16   - @Schema(description = "创建时间", required = true)
  16 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
17 17 private LocalDateTime createTime;
18 18  
19 19 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoUpdateReqVO.java
... ... @@ -9,7 +9,7 @@ import javax.validation.constraints.*;
9 9 @ToString(callSuper = true)
10 10 public class TestDemoUpdateReqVO extends TestDemoBaseVO {
11 11  
12   - @Schema(description = "编号", required = true)
  12 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
13 13 @NotNull(message = "编号不能为空")
14 14 private Long id;
15 15  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm
... ... @@ -17,7 +17,7 @@ public class ${sceneEnum.prefixClass}${table.className}RespVO extends ${sceneEnu
17 17  
18 18 #foreach ($column in $columns)
19 19 #if (${column.listOperationResult} && (!${column.createOperation} || !${column.updateOperation}))##不是通用字段
20   - @Schema(description = "${column.columnComment}"#if (!${column.nullable}), required = true#end#if ("$!column.example" != ""), example = "${column.example}"#end)
  20 + @Schema(description = "${column.columnComment}"#if (!${column.nullable}), requiredMode = Schema.RequiredMode.REQUIRED#end#if ("$!column.example" != ""), example = "${column.example}"#end)
21 21 private ${column.javaType} ${column.javaField};
22 22  
23 23 #end
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
... ... @@ -16,7 +16,7 @@ export interface ${simpleClassName}VO {
16 16 }
17 17  
18 18 // 查询${table.classComment}列表
19   -export const get${simpleClassName}Page = async (params: ${simpleClassName}PageReqVO) => {
  19 +export const get${simpleClassName}Page = async (params) => {
20 20 return await request.get({ url: `${baseURL}/page`, params })
21 21 }
22 22  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_schema/api/api.ts.vm
... ... @@ -16,7 +16,7 @@ export interface ${simpleClassName}VO {
16 16 }
17 17  
18 18 // 查询${table.classComment}列表
19   -export const get${simpleClassName}Page = async (params: ${simpleClassName}PageReqVO) => {
  19 +export const get${simpleClassName}Page = async (params) => {
20 20 return await request.get({ url: '${baseURL}/page', params })
21 21 }
22 22  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm
1 1 import { BasicColumn, FormSchema, useRender } from '@/components/Table'
2   -import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
  2 +import { DICT_TYPE, getDictOptions } from '@/utils/dict'
3 3  
4 4 export const columns: BasicColumn[] = [
5 5 #foreach($column in $columns)
... ... @@ -53,7 +53,7 @@ export const searchFormSchema: FormSchema[] = [
53 53 component: 'Select',
54 54 componentProps: {
55 55 #if ("" != $dictType)## 设置了 dictType 数据字典的情况
56   - options: getIntDictOptions(DICT_TYPE.$dictType.toUpperCase())
  56 + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase())
57 57 #else## 未设置 dictType 数据字典的情况
58 58 options: []
59 59 #end
... ... @@ -67,7 +67,7 @@ export const searchFormSchema: FormSchema[] = [
67 67 #end
68 68 ]
69 69  
70   -export const formSchema: FormSchema[] = [
  70 +export const createFormSchema: FormSchema[] = [
71 71 {
72 72 label: '编号',
73 73 field: 'id',
... ... @@ -75,7 +75,7 @@ export const formSchema: FormSchema[] = [
75 75 component: 'Input'
76 76 },
77 77 #foreach($column in $columns)
78   -#if ($column.createOperation || $column.updateOperation)
  78 +#if ($column.createOperation)
79 79 #set ($dictType = $column.dictType)
80 80 #set ($javaField = $column.javaField)
81 81 #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
... ... @@ -90,16 +90,24 @@ export const formSchema: FormSchema[] = [
90 90 #if ($column.htmlType == "input")
91 91 component: 'Input'
92 92 #elseif($column.htmlType == "imageUpload")## 图片上传
93   - component: 'Upload'
  93 + component: 'FileUpload',
  94 + componentProps: {
  95 + fileType: 'file',
  96 + maxCount: 1
  97 + }
94 98 #elseif($column.htmlType == "fileUpload")## 文件上传
95   - component: 'Upload'
  99 + component: 'FileUpload',
  100 + componentProps: {
  101 + fileType: 'image',
  102 + maxCount: 1
  103 + }
96 104 #elseif($column.htmlType == "editor")## 文本编辑器
97   - component: 'InputTextArea'
  105 + component: 'Editor'
98 106 #elseif($column.htmlType == "select")## 下拉框
99 107 component: 'Select',
100 108 componentProps: {
101 109 #if ("" != $dictType)## 有数据字典
102   - options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
  110 + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
103 111 #else##没数据字典
104 112 options:[]
105 113 #end
... ... @@ -108,7 +116,7 @@ export const formSchema: FormSchema[] = [
108 116 component: 'Checkbox',
109 117 componentProps: {
110 118 #if ("" != $dictType)## 有数据字典
111   - options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
  119 + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
112 120 #else##没数据字典
113 121 options:[]
114 122 #end
... ... @@ -117,7 +125,7 @@ export const formSchema: FormSchema[] = [
117 125 component: 'Radio',
118 126 componentProps: {
119 127 #if ("" != $dictType)## 有数据字典
120   - options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
  128 + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
121 129 #else##没数据字典
122 130 options:[]
123 131 #end
... ... @@ -132,3 +140,69 @@ export const formSchema: FormSchema[] = [
132 140 #end
133 141 #end
134 142 ]
  143 +
  144 +export const updateFormSchema: FormSchema[] = [
  145 + {
  146 + label: '编号',
  147 + field: 'id',
  148 + show: false,
  149 + component: 'Input'
  150 + },
  151 +#foreach($column in $columns)
  152 +#if ($column.updateOperation)
  153 +#set ($dictType = $column.dictType)
  154 +#set ($javaField = $column.javaField)
  155 +#set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
  156 +#set ($comment = $column.columnComment)
  157 +#if (!$column.primaryKey)## 忽略主键,不用在表单里
  158 + {
  159 + label: '${comment}',
  160 + field: '${javaField}',
  161 + #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
  162 + required: true,
  163 + #end
  164 + #if ($column.htmlType == "input")
  165 + component: 'Input'
  166 + #elseif($column.htmlType == "imageUpload")## 图片上传
  167 + component: 'Upload'
  168 + #elseif($column.htmlType == "fileUpload")## 文件上传
  169 + component: 'Upload'
  170 + #elseif($column.htmlType == "editor")## 文本编辑器
  171 + component: 'Editor'
  172 + #elseif($column.htmlType == "select")## 下拉框
  173 + component: 'Select',
  174 + componentProps: {
  175 + #if ("" != $dictType)## 有数据字典
  176 + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
  177 + #else##没数据字典
  178 + options:[]
  179 + #end
  180 + }
  181 + #elseif($column.htmlType == "checkbox")## 多选框
  182 + component: 'Checkbox',
  183 + componentProps: {
  184 + #if ("" != $dictType)## 有数据字典
  185 + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
  186 + #else##没数据字典
  187 + options:[]
  188 + #end
  189 + }
  190 + #elseif($column.htmlType == "radio")## 单选框
  191 + component: 'Radio',
  192 + componentProps: {
  193 + #if ("" != $dictType)## 有数据字典
  194 + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
  195 + #else##没数据字典
  196 + options:[]
  197 + #end
  198 + }
  199 + #elseif($column.htmlType == "datetime")## 时间框
  200 + component: 'DatePicker'
  201 + #elseif($column.htmlType == "textarea")## 文本域
  202 + component: 'InputTextArea'
  203 + #end
  204 + },
  205 +#end
  206 +#end
  207 +#end
  208 +]
135 209 \ No newline at end of file
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm
1 1 <template>
2   - <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
  2 + <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? t('action.edit') : t('action.create')" @ok="handleSubmit">
3 3 <BasicForm @register="registerForm" />
4 4 </BasicModal>
5 5 </template>
6   -<script lang="ts" setup name="${table.className}Modal">
7   - import { ref, unref } from 'vue'
8   - import { BasicModal, useModalInner } from '@/components/Modal'
9   - import { BasicForm, useForm } from '@/components/Form'
10   - import { formSchema } from './${classNameVar}.data'
11   - import { create${simpleClassName}, get${simpleClassName}, update${simpleClassName} } from '@/api/${table.moduleName}/${classNameVar}'
  6 +<script lang="ts" setup>
  7 +import { ref, unref } from 'vue'
  8 +import { useI18n } from '@/hooks/web/useI18n'
  9 +import { useMessage } from '@/hooks/web/useMessage'
  10 +import { BasicForm, useForm } from '@/components/Form'
  11 +import { BasicModal, useModalInner } from '@/components/Modal'
  12 +import { createFormSchema, updateFormSchema } from './${classNameVar}.data'
  13 +import { create${simpleClassName}, get${simpleClassName}, update${simpleClassName} } from '@/api/${table.moduleName}/${classNameVar}'
12 14  
13   - const emit = defineEmits(['success', 'register'])
14   - const isUpdate = ref(true)
  15 +defineOptions({ name: '${table.className}Modal' })
15 16  
16   - const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
17   - labelWidth: 120,
18   - baseColProps: { span: 24 },
19   - schemas: formSchema,
20   - showActionButtonGroup: false,
21   - actionColOptions: { span: 23 }
22   - })
  17 +const { t } = useI18n()
  18 +const { createMessage } = useMessage()
  19 +const emit = defineEmits(['success', 'register'])
  20 +const isUpdate = ref(true)
23 21  
24   - const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
25   - resetFields()
26   - setModalProps({ confirmLoading: false })
27   - isUpdate.value = !!data?.isUpdate
28   - if (unref(isUpdate)) {
29   - const res = await get${simpleClassName}(data.record.id)
30   - setFieldsValue({ ...res })
31   - }
32   - })
  22 +const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
  23 + labelWidth: 120,
  24 + baseColProps: { span: 24 },
  25 + schemas: isUpdate? updateFormSchema : createFormSchema,
  26 + showActionButtonGroup: false,
  27 + actionColOptions: { span: 23 }
  28 +})
33 29  
34   - async function handleSubmit() {
35   - try {
36   - const values = await validate()
37   - setModalProps({ confirmLoading: true })
38   - if (unref(isUpdate)) {
39   - await update${simpleClassName}(values)
40   - } else {
41   - await create${simpleClassName}(values)
42   - }
43   - closeModal()
44   - emit('success')
45   - } finally {
46   - setModalProps({ confirmLoading: false })
  30 +const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
  31 + resetFields()
  32 + setModalProps({ confirmLoading: false })
  33 + isUpdate.value = !!data?.isUpdate
  34 + if (unref(isUpdate)) {
  35 + const res = await get${simpleClassName}(data.record.id)
  36 + setFieldsValue({ ...res })
  37 + }
  38 +})
  39 +
  40 +async function handleSubmit() {
  41 + try {
  42 + const values = await validate()
  43 + setModalProps({ confirmLoading: true })
  44 + if (unref(isUpdate)) {
  45 + await update${simpleClassName}(values)
  46 + } else {
  47 + await create${simpleClassName}(values)
47 48 }
  49 + closeModal()
  50 + emit('success')
  51 + createMessage.success(t('common.saveSuccessText'))
  52 + } finally {
  53 + setModalProps({ confirmLoading: false })
48 54 }
  55 +}
49 56 </script>
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm
... ... @@ -33,58 +33,60 @@
33 33 <${simpleClassName}Modal @register="registerModal" @success="reload()" />
34 34 </div>
35 35 </template>
36   -<script lang="ts" setup name="${table.className}">
37   - import { useI18n } from '@/hooks/web/useI18n'
38   - import { useMessage } from '@/hooks/web/useMessage'
39   - import { useModal } from '@/components/Modal'
40   - import ${simpleClassName}Modal from './${simpleClassName}Modal.vue'
41   - import { IconEnum } from '@/enums/appEnum'
42   - import { BasicTable, useTable, TableAction } from '@/components/Table'
43   - import { delete${simpleClassName}, export${simpleClassName}, get${simpleClassName}Page } from '@/api/${table.moduleName}/${classNameVar}'
44   - import { columns, searchFormSchema } from './${classNameVar}.data'
  36 +<script lang="ts" setup>
  37 +import { useI18n } from '@/hooks/web/useI18n'
  38 +import { useMessage } from '@/hooks/web/useMessage'
  39 +import { useModal } from '@/components/Modal'
  40 +import ${simpleClassName}Modal from './${simpleClassName}Modal.vue'
  41 +import { IconEnum } from '@/enums/appEnum'
  42 +import { BasicTable, useTable, TableAction } from '@/components/Table'
  43 +import { delete${simpleClassName}, export${simpleClassName}, get${simpleClassName}Page } from '@/api/${table.moduleName}/${classNameVar}'
  44 +import { columns, searchFormSchema } from './${classNameVar}.data'
45 45  
46   - const { t } = useI18n()
47   - const { createConfirm, createMessage } = useMessage()
48   - const [registerModal, { openModal }] = useModal()
  46 +defineOptions({ name: '${table.className}' })
49 47  
50   - const [registerTable, { getForm, reload }] = useTable({
51   - title: '${table.classComment}列表',
52   - api: get${simpleClassName}Page,
53   - columns,
54   - formConfig: { labelWidth: 120, schemas: searchFormSchema },
55   - useSearchForm: true,
56   - showTableSetting: true,
57   - actionColumn: {
58   - width: 140,
59   - title: t('common.action'),
60   - dataIndex: 'action',
61   - fixed: 'right'
62   - }
63   - })
  48 +const { t } = useI18n()
  49 +const { createConfirm, createMessage } = useMessage()
  50 +const [registerModal, { openModal }] = useModal()
64 51  
65   - function handleCreate() {
66   - openModal(true, { isUpdate: false })
  52 +const [registerTable, { getForm, reload }] = useTable({
  53 + title: '${table.classComment}列表',
  54 + api: get${simpleClassName}Page,
  55 + columns,
  56 + formConfig: { labelWidth: 120, schemas: searchFormSchema },
  57 + useSearchForm: true,
  58 + showTableSetting: true,
  59 + actionColumn: {
  60 + width: 140,
  61 + title: t('common.action'),
  62 + dataIndex: 'action',
  63 + fixed: 'right'
67 64 }
  65 +})
68 66  
69   - function handleEdit(record: Recordable) {
70   - openModal(true, { record, isUpdate: true })
71   - }
  67 +function handleCreate() {
  68 + openModal(true, { isUpdate: false })
  69 +}
72 70  
73   - async function handleExport() {
74   - createConfirm({
75   - title: t('common.exportTitle'),
76   - iconType: 'warning',
77   - content: t('common.exportMessage'),
78   - async onOk() {
79   - await export${simpleClassName}(getForm().getFieldsValue())
80   - createMessage.success(t('common.exportSuccessText'))
81   - }
82   - })
83   - }
  71 +function handleEdit(record: Recordable) {
  72 + openModal(true, { record, isUpdate: true })
  73 +}
84 74  
85   - async function handleDelete(record: Recordable) {
86   - await delete${simpleClassName}(record.id)
87   - createMessage.success(t('common.delSuccessText'))
88   - reload()
89   - }
  75 +async function handleExport() {
  76 + createConfirm({
  77 + title: t('common.exportTitle'),
  78 + iconType: 'warning',
  79 + content: t('common.exportMessage'),
  80 + async onOk() {
  81 + await export${simpleClassName}(getForm().getFieldsValue())
  82 + createMessage.success(t('common.exportSuccessText'))
  83 + }
  84 + })
  85 +}
  86 +
  87 +async function handleDelete(record: Recordable) {
  88 + await delete${simpleClassName}(record.id)
  89 + createMessage.success(t('common.delSuccessText'))
  90 + reload()
  91 +}
90 92 </script>
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
... ... @@ -12,22 +12,22 @@ import javax.validation.constraints.NotNull;
12 12 @Data
13 13 public class ProductBrandBaseVO {
14 14  
15   - @Schema(description = "品牌名称", required = true, example = "芋道")
  15 + @Schema(description = "品牌名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
16 16 @NotNull(message = "品牌名称不能为空")
17 17 private String name;
18 18  
19   - @Schema(description = "品牌图片", required = true)
  19 + @Schema(description = "品牌图片", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 @NotNull(message = "品牌图片不能为空")
21 21 private String picUrl;
22 22  
23   - @Schema(description = "品牌排序", required = true, example = "1")
  23 + @Schema(description = "品牌排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
24 24 @NotNull(message = "品牌排序不能为空")
25 25 private Integer sort;
26 26  
27 27 @Schema(description = "品牌描述", example = "描述")
28 28 private String description;
29 29  
30   - @Schema(description = "状态", required = true, example = "0")
  30 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
31 31 @NotNull(message = "状态不能为空")
32 32 private Integer status;
33 33  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandRespVO.java
... ... @@ -13,10 +13,10 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class ProductBrandRespVO extends ProductBrandBaseVO {
15 15  
16   - @Schema(description = "品牌编号", required = true, example = "1")
  16 + @Schema(description = "品牌编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
17 17 private Long id;
18 18  
19   - @Schema(description = "创建时间", required = true)
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private LocalDateTime createTime;
21 21  
22 22 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandUpdateReqVO.java
... ... @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
13 13 @ToString(callSuper = true)
14 14 public class ProductBrandUpdateReqVO extends ProductBrandBaseVO {
15 15  
16   - @Schema(description = "品牌编号", required = true, example = "1")
  16 + @Schema(description = "品牌编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
17 17 @NotNull(message = "品牌编号不能为空")
18 18 private Long id;
19 19  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
... ... @@ -13,25 +13,25 @@ import javax.validation.constraints.NotNull;
13 13 @Data
14 14 public class ProductCategoryBaseVO {
15 15  
16   - @Schema(description = "父分类编号", required = true, example = "1")
  16 + @Schema(description = "父分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
17 17 @NotNull(message = "父分类编号不能为空")
18 18 private Long parentId;
19 19  
20   - @Schema(description = "分类名称", required = true, example = "办公文具")
  20 + @Schema(description = "分类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "办公文具")
21 21 @NotBlank(message = "分类名称不能为空")
22 22 private String name;
23 23  
24   - @Schema(description = "分类图片", required = true)
  24 + @Schema(description = "分类图片", requiredMode = Schema.RequiredMode.REQUIRED)
25 25 @NotBlank(message = "分类图片不能为空")
26 26 private String picUrl;
27 27  
28   - @Schema(description = "分类排序", required = true, example = "1")
  28 + @Schema(description = "分类排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
29 29 private Integer sort;
30 30  
31   - @Schema(description = "分类描述", required = true, example = "描述")
  31 + @Schema(description = "分类描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "描述")
32 32 private String description;
33 33  
34   - @Schema(description = "开启状态", required = true, example = "0")
  34 + @Schema(description = "开启状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
35 35 @NotNull(message = "开启状态不能为空")
36 36 private Integer status;
37 37  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryRespVO.java
... ... @@ -13,10 +13,10 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class ProductCategoryRespVO extends ProductCategoryBaseVO {
15 15  
16   - @Schema(description = "分类编号", required = true, example = "2")
  16 + @Schema(description = "分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
17 17 private Long id;
18 18  
19   - @Schema(description = "创建时间", required = true)
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private LocalDateTime createTime;
21 21  
22 22 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryUpdateReqVO.java
... ... @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
13 13 @ToString(callSuper = true)
14 14 public class ProductCategoryUpdateReqVO extends ProductCategoryBaseVO {
15 15  
16   - @Schema(description = "分类编号", required = true, example = "2")
  16 + @Schema(description = "分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
17 17 @NotNull(message = "分类编号不能为空")
18 18 private Long id;
19 19  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
... ... @@ -9,10 +9,10 @@ import java.util.List;
9 9 @Data
10 10 public class ProductPropertyAndValueRespVO {
11 11  
12   - @Schema(description = "属性项的编号", required = true, example = "1024")
  12 + @Schema(description = "属性项的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 13 private Long id;
14 14  
15   - @Schema(description = "属性项的名称", required = true, example = "颜色")
  15 + @Schema(description = "属性项的名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "颜色")
16 16 private String name;
17 17  
18 18 /**
... ... @@ -24,10 +24,10 @@ public class ProductPropertyAndValueRespVO {
24 24 @Data
25 25 public static class Value {
26 26  
27   - @Schema(description = "属性值的编号", required = true, example = "2048")
  27 + @Schema(description = "属性值的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
28 28 private Long id;
29 29  
30   - @Schema(description = "属性值的名称", required = true, example = "红色")
  30 + @Schema(description = "属性值的名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "红色")
31 31 private String name;
32 32  
33 33 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
... ... @@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank;
12 12 @Data
13 13 public class ProductPropertyBaseVO {
14 14  
15   - @Schema(description = "名称", required = true, example = "颜色")
  15 + @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "颜色")
16 16 @NotBlank(message = "名称不能为空")
17 17 private String name;
18 18  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
... ... @@ -20,7 +20,7 @@ public class ProductPropertyPageReqVO extends PageParam {
20 20 @Schema(description = "名称", example = "颜色")
21 21 private String name;
22 22  
23   - @Schema(description = "状态", required = true, example = "1")
  23 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
24 24 private Integer status;
25 25  
26 26 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
... ... @@ -13,10 +13,10 @@ import java.time.LocalDateTime;
13 13 @ToString(callSuper = true)
14 14 public class ProductPropertyRespVO extends ProductPropertyBaseVO {
15 15  
16   - @Schema(description = "编号", required = true, example = "1024")
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 private Long id;
18 18  
19   - @Schema(description = "创建时间", required = true)
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private LocalDateTime createTime;
21 21  
22 22 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
... ... @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
13 13 @ToString(callSuper = true)
14 14 public class ProductPropertyUpdateReqVO extends ProductPropertyBaseVO {
15 15  
16   - @Schema(description = "主键", required = true, example = "1")
  16 + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
17 17 @NotNull(message = "主键不能为空")
18 18 private Long id;
19 19  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
... ... @@ -13,11 +13,11 @@ import javax.validation.constraints.NotNull;
13 13 @Data
14 14 public class ProductPropertyValueBaseVO {
15 15  
16   - @Schema(description = "属性项的编号", required = true, example = "1024")
  16 + @Schema(description = "属性项的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 @NotNull(message = "属性项的编号不能为空")
18 18 private Long propertyId;
19 19  
20   - @Schema(description = "名称", required = true, example = "红色")
  20 + @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "红色")
21 21 @NotEmpty(message = "名称名字不能为空")
22 22 private String name;
23 23  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueDetailRespVO.java
... ... @@ -7,16 +7,16 @@ import lombok.Data;
7 7 @Data
8 8 public class ProductPropertyValueDetailRespVO {
9 9  
10   - @Schema(description = "属性的编号", required = true, example = "1")
  10 + @Schema(description = "属性的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
11 11 private Long propertyId;
12 12  
13   - @Schema(description = "属性的名称", required = true, example = "颜色")
  13 + @Schema(description = "属性的名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "颜色")
14 14 private String propertyName;
15 15  
16   - @Schema(description = "属性值的编号", required = true, example = "1024")
  16 + @Schema(description = "属性值的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 17 private Long valueId;
18 18  
19   - @Schema(description = "属性值的名称", required = true, example = "红色")
  19 + @Schema(description = "属性值的名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "红色")
20 20 private String valueName;
21 21  
22 22 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
... ... @@ -18,7 +18,7 @@ public class ProductPropertyValuePageReqVO extends PageParam {
18 18 @Schema(description = "名称", example = "红色")
19 19 private String name;
20 20  
21   - @Schema(description = "状态", required = true, example = "1")
  21 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
22 22 private Integer status;
23 23  
24 24 }
... ...