diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnFieldConf.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnFieldConf.java index 66ebb5156..9c5a8f6a9 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnFieldConf.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnFieldConf.java @@ -47,8 +47,7 @@ public class BpmnFieldConf { /** * 单选或多选的下拉选择框中的数据, 只有单选或多选的时候才会有值,并且内部的属性不应该为空 */ - @ApiModelProperty(value = "单选或多选的下拉选择框中的数据", example = "[{\"name\": \"选项1\", \"value\": \"1\"}, " + - "{\"name\": \"选项2\", \"value\": \"2\"}]") + @ApiModelProperty(value = "单选或多选的下拉选择框中的数据") @Valid private List options; } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/model/BpmnModelCreateDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/model/BpmnModelCreateDTO.java index a2e151699..cc73413c8 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/model/BpmnModelCreateDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/model/BpmnModelCreateDTO.java @@ -1,12 +1,16 @@ package cn.axzo.workflow.common.model.request.bpmn.model; +import cn.axzo.workflow.common.model.request.bpmn.BpmnButtonConf; +import cn.axzo.workflow.common.model.request.bpmn.BpmnFieldConf; import cn.axzo.workflow.common.model.request.bpmn.BpmnJsonNode; +import cn.axzo.workflow.common.model.request.bpmn.BpmnNoticeConf; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; /** @@ -33,7 +37,8 @@ public class BpmnModelCreateDTO { /** * 自定义分类 */ - @ApiModelProperty(value = "自定义分类", notes = "由业务自定义", example = "1") + @ApiModelProperty(value = "自定义分类", notes = "由业务自定义") + @NotBlank(message = "自定义分类不能为空") private String category; /** @@ -45,9 +50,30 @@ public class BpmnModelCreateDTO { /** * 流程的Json 结构 */ - @ApiModelProperty(value = "流程的Json 结构", example = "1") + @ApiModelProperty(value = "流程的 Json 结构") private BpmnJsonNode node; + /** + * 通知管理配置 + */ + @ApiModelProperty(value = "通知管理配置") + @Valid + private BpmnNoticeConf noticeConf; + + /** + * 流程定义的全局默认按钮权限数据 + */ + @ApiModelProperty(value = "流程按钮配置") + @Valid + private BpmnButtonConf buttonConf; + + /** + * 流程定义的全局字段管理数据 + */ + @ApiModelProperty(value = "流程字段配置") + @Valid + private BpmnFieldConf fieldConf; + /** * 租户Id */