BJ_ZTEITS-Developers / parking-cloud-yudao

Commit aac6cc7bf852203854bd1431ac765f2893867baa

Authored by YunaiV
1 parent 3acb56f8

1. 完善 bpm task rule 的注解和校验

Inline Side-by-side
Showing 6 changed files with 45 additions and 4 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmUserGroupSimpleRespVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupSimpleRespVO.java
  View file @aac6cc7
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule; 1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelUpdateReqVO.java
  View file @aac6cc7
1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model; 1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmModelFormTypeEnum;  
4 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
5 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
6 import lombok.Data; 5 import lombok.Data;
7 -import lombok.EqualsAndHashCode;  
8 -import lombok.ToString;  
9 6
10 import javax.validation.constraints.NotEmpty; 7 import javax.validation.constraints.NotEmpty;
11 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleBaseVO.java
  View file @aac6cc7
1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule; 1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule;
2 2
  3 +import io.swagger.annotations.ApiModelProperty;
3 import lombok.Data; 4 import lombok.Data;
4 5
  6 +import javax.validation.constraints.NotEmpty;
  7 +import javax.validation.constraints.NotNull;
5 import java.util.Set; 8 import java.util.Set;
6 9
  10 +/**
  11 + * 流程任务分配规则 Base VO，提供给添加、修改、详细的子 VO 使用
  12 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  13 + */
7 @Data 14 @Data
8 public class BpmTaskAssignRuleBaseVO { 15 public class BpmTaskAssignRuleBaseVO {
9 16
  17 + @ApiModelProperty(value = "规则类型", required = true, example = "bpm_task_assign_rule_type")
  18 + @NotNull(message = "规则类型不能为空")
10 private Integer type; 19 private Integer type;
11 20
  21 + @ApiModelProperty(value = "规则值数组", required = true, example = "1,2,3")
  22 + @NotNull(message = "规则值数组不能为空")
12 private Set<Long> options; 23 private Set<Long> options;
13 24
14 } 25 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java
  View file @aac6cc7
1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule; 1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule;
2 2
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
3 import lombok.Data; 5 import lombok.Data;
4 import lombok.EqualsAndHashCode; 6 import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
5 8
  9 +import javax.validation.constraints.NotEmpty;
  10 +
  11 +@ApiModel("流程任务分配规则的创建 Request VO")
6 @Data 12 @Data
7 @EqualsAndHashCode(callSuper = true) 13 @EqualsAndHashCode(callSuper = true)
  14 +@ToString(callSuper = true)
8 public class BpmTaskAssignRuleCreateReqVO extends BpmTaskAssignRuleBaseVO { 15 public class BpmTaskAssignRuleCreateReqVO extends BpmTaskAssignRuleBaseVO {
9 16
  17 + @ApiModelProperty(value = "流程模型的编号", required = true, example = "1024")
  18 + @NotEmpty(message = "流程模型的编号不能为空")
10 private String modelId; 19 private String modelId;
11 20
  21 + @ApiModelProperty(value = "流程任务定义的编号", required = true, example = "2048")
  22 + @NotEmpty(message = "流程任务定义的编号不能为空")
12 private String taskDefinitionKey; 23 private String taskDefinitionKey;
13 24
14 } 25 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleRespVO.java
  View file @aac6cc7
1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule; 1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule;
2 2
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
3 import lombok.Data; 5 import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
4 8
  9 +@ApiModel("流程任务分配规则的 Response VO")
5 @Data 10 @Data
  11 +@EqualsAndHashCode(callSuper = true)
  12 +@ToString(callSuper = true)
6 public class BpmTaskAssignRuleRespVO extends BpmTaskAssignRuleBaseVO { 13 public class BpmTaskAssignRuleRespVO extends BpmTaskAssignRuleBaseVO {
7 14
  15 + @ApiModelProperty(value = "任务分配规则的编号", required = true, example = "1024")
8 private Long id; 16 private Long id;
9 17
  18 + @ApiModelProperty(value = "流程模型的编号", required = true, example = "2048")
10 private String modelId; 19 private String modelId;
11 20
  21 + @ApiModelProperty(value = "流程定义的编号", required = true, example = "4096")
12 private String processDefinitionId; 22 private String processDefinitionId;
13 23
  24 + @ApiModelProperty(value = "流程任务定义的编号", required = true, example = "2048")
14 private String taskDefinitionKey; 25 private String taskDefinitionKey;
  26 + @ApiModelProperty(value = "流程任务定义的名字", required = true, example = "关注芋道")
15 private String taskDefinitionName; 27 private String taskDefinitionName;
16 28
17 } 29 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java
  View file @aac6cc7
1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule; 1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule;
2 2
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
3 import lombok.Data; 5 import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
4 8
  9 +import javax.validation.constraints.NotNull;
5 import java.util.Set; 10 import java.util.Set;
6 11
  12 +@ApiModel("流程任务分配规则的更新 Request VO")
7 @Data 13 @Data
  14 +@EqualsAndHashCode(callSuper = true)
  15 +@ToString(callSuper = true)
8 public class BpmTaskAssignRuleUpdateReqVO extends BpmTaskAssignRuleBaseVO { 16 public class BpmTaskAssignRuleUpdateReqVO extends BpmTaskAssignRuleBaseVO {
9 17
  18 + @ApiModelProperty(value = "任务分配规则的编号", required = true, example = "1024")
  19 + @NotNull(message = "任务分配规则的编号不能为空")
10 private Long id; 20 private Long id;
11 21
12 } 22 }