update - 新增配置台功能相关的模型

workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnButtonConf.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * 流程定义中的按钮配置
@@ -21,66 +22,87 @@ import javax.validation.constraints.NotBlank;
 public class BpmnButtonConf {
 
     /**
-     * 发起人的按钮配置信息, JSON 格式
+     * 发起人的按钮配置信息,
      */
-    @ApiModelProperty(value = "发起人的按钮配置信息, JSON 格式", example = "{\"agree\": true, \"reject\": true, \"delegate\": " +
+    @ApiModelProperty(value = "发起人的按钮配置信息")
-            "true, \"cancel\": true, \"withdraw\": true, \"revoke\": true\" }")
     @NotBlank(message = "发起人的按钮配置信息不能为空")
-    private String initiator;
+    private List<BpmnButtonMeta> initiator;
+
 
     /**
      * 当前审批人的按钮配置信息, JSON 格式
      */
-    @ApiModelProperty(value = "当前审批人的按钮配置信息, JSON 格式", example = "{\"agree\": true, \"reject\": true, \"delegate\": " +
+    @ApiModelProperty(value = "当前审批人的按钮配置信息")
-            "true, \"cancel\": true, \"withdraw\": true, \"revoke\": true\" }")
     @NotBlank(message = "当前审批人的按钮配置信息不能为空")
-    private String current;
+    private List<BpmnButtonMeta> current;
 
     /**
      * 历史审批人的按钮配置信息, JSON 格式
      */
-    @ApiModelProperty(value = "历史审批人的按钮配置信息, JSON 格式", example = "{\"agree\": true, \"reject\": true, \"delegate\": " +
+    @ApiModelProperty(value = "历史审批人的按钮配置信息")
-            "true, \"cancel\": true, \"withdraw\": true, \"revoke\": true\" }")
     @NotBlank(message = "历史审批人的按钮配置信息不能为空")
-    private String history;
+    private List<BpmnButtonMeta> history;
 
     /**
      * 抄送人的按钮配置信息, JSON 格式
      */
-    @ApiModelProperty(value = "抄送人的按钮配置信息, JSON 格式", example = "{\"agree\": true, \"reject\": true, \"delegate\": " +
+    @ApiModelProperty(value = "抄送人的按钮配置信息")
-            "true, \"cancel\": true, \"withdraw\": true, \"revoke\": true\" }")
     @NotBlank(message = "抄送人的按钮配置信息不能为空")
-    private String carbonCopy;
+    private List<BpmnButtonMeta> carbonCopy;
 
-    public String getInitiator() {
+    public List<BpmnButtonMeta> getInitiator() {
         return initiator;
     }
 
-    public void setInitiator(String initiator) {
+    public void setInitiator(List<BpmnButtonMeta> initiator) {
         this.initiator = initiator;
     }
 
-    public String getCurrent() {
+    public List<BpmnButtonMeta> getCurrent() {
         return current;
     }
 
-    public void setCurrent(String current) {
+    public void setCurrent(List<BpmnButtonMeta> current) {
         this.current = current;
     }
 
-    public String getHistory() {
+    public List<BpmnButtonMeta> getHistory() {
         return history;
     }
 
-    public void setHistory(String history) {
+    public void setHistory(List<BpmnButtonMeta> history) {
         this.history = history;
     }
 
-    public String getCarbonCopy() {
+    public List<BpmnButtonMeta> getCarbonCopy() {
         return carbonCopy;
     }
 
-    public void setCarbonCopy(String carbonCopy) {
+    public void setCarbonCopy(List<BpmnButtonMeta> carbonCopy) {
         this.carbonCopy = carbonCopy;
     }
+
+    @Data
+    @Accessors(chain = true)
+    static class BpmnButtonMeta {
+        private String btnKey;
+
+        private Boolean enabled;
+
+        public String getBtnKey() {
+            return btnKey;
+        }
+
+        public void setBtnKey(String btnKey) {
+            this.btnKey = btnKey;
+        }
+
+        public Boolean getEnabled() {
+            return enabled;
+        }
+
+        public void setEnabled(Boolean enabled) {
+            this.enabled = enabled;
+        }
+    }
 }

workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnFieldConf.java

@@ -37,10 +37,9 @@ public class BpmnFieldConf {
     private String name;
 
     /**
-     * 字段的类型
+     * 字段的类型 string, number, radio, checkbox
      */
-    @ApiModelProperty(value = "字段的类型", example = "string", notes = "string, number, date, datetime, boolean, " +
+    @ApiModelProperty(value = "字段的类型", example = "string", notes = "string, number, radio, checkbox")
-            "select, radio, checkbox, textarea, file, image, editor")
     @NotBlank(message = "字段的类型不能为空")
     private String type;
 

workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnJsonNode.java

@@ -22,19 +22,41 @@ import java.util.Map;
 @Accessors(chain = true)
 public class BpmnJsonNode {
 
+    /**
+     * 节点唯一标识
+     */
     @ApiModelProperty(value = "节点ID")
     @NotBlank(message = "节点的 ID 不能为空")
     private String id;
+    /**
+     * 上级节点唯一标识
+     */
     @ApiModelProperty(value = "父节点ID")
     private String parentId;
+    /**
+     * 节点类型 NODE_STARTER(发起人) NODE_TASK(审核节点) NODE_BUSINESS(业务节点) NODE_CARBON_COPY(抄送节点) NODE_EMPTY(空节点)
+     * NODE_EXCLUSIVE_GATEWAY(排它网关) NODE_CONDITION(分支)
+     */
     @ApiModelProperty(value = "节点类型")
     private BpmnFlowNodeType type;
+    /**
+     * 节点名称
+     */
     @ApiModelProperty(value = "节点名称")
     private String name;
+    /**
+     * 子节点信息(一般子节点的类型为审批节点/业务节点/抄送节点; 条件分支用 branches 字段)
+     */
     @ApiModelProperty(value = "子节点信息")
     private BpmnJsonNode children;
+    /**
+     * 分支节点信息(只用存储条件分支的信息, 而不能将审批节点/业务节点/抄送节点放到这里)
+     */
     @ApiModelProperty(value = "分支节点信息")
     private List<BpmnJsonNode> branches;
+    /**
+     * 节点扩展属性, 比如审批方式/审批人指定等针对节点的配置信息
+     */
     @ApiModelProperty(value = "节点扩展属性")
     private BpmnJsonNodeProperty property;