Merge pull request #89 from codingapi/dev

Dev

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/form/DataType.java

@@ -3,6 +3,5 @@
 public enum DataType {
     STRING,
     NUMBER,
-    DATE,
     BOOLEAN
 }

flow-engine-framework/src/main/java/com/codingapi/flow/form/FieldAttribute.java

@@ -0,0 +1,16 @@
+package com.codingapi.flow.form;
+
+import lombok.Data;
+
+/**
+ * 附加属性
+ */
+@Data
+public class FieldAttribute {
+    // 属性key
+    private String key;
+    // 属性名称
+    private String label;
+    // 属性值
+    private String value;
+}

flow-engine-framework/src/main/java/com/codingapi/flow/form/FlowForm.java

@@ -66,13 +66,26 @@ public static FlowForm fromMap(Map<String, Object> map) {
                 fieldMeta.setId((String) field.get("id"));
                 fieldMeta.setName((String) field.get("name"));
                 fieldMeta.setCode((String) field.get("code"));
-                fieldMeta.setType(DataType.valueOf((String) field.get("type")));
+                fieldMeta.setType((String) field.get("type"));
+                fieldMeta.setDataType(DataType.valueOf((String) field.get("dataType")));
                 fieldMeta.setRequired(Boolean.TRUE.equals(field.get("required")));
                 fieldMeta.setHidden(Boolean.TRUE.equals(field.get("hidden")));
                 fieldMeta.setDefaultValue((String) field.get("defaultValue"));
                 fieldMeta.setPlaceholder((String) field.get("placeholder"));
                 fieldMeta.setTooltip((String) field.get("tooltip"));
                 fieldMeta.setHelp((String) field.get("help"));
+                List<Map<String, Object>> attributes = (List<Map<String, Object>>)field.get("attributes");
+                if(attributes!=null) {
+                    List<FieldAttribute> attributeList = new ArrayList<>();
+                    for (Map<String, Object> attribute : attributes){
+                        FieldAttribute fieldAttribute = new FieldAttribute();
+                        fieldAttribute.setKey((String) attribute.get("key"));
+                        fieldAttribute.setLabel((String) attribute.get("label"));
+                        fieldAttribute.setValue((String) attribute.get("value"));
+                        attributeList.add(fieldAttribute);
+                    }
+                    fieldMeta.setAttributes(attributeList);
+                }
                 fieldList.add(fieldMeta);
             }
         }
@@ -108,10 +121,10 @@ public FormField getField(String fieldName) {
         return fields.stream().filter(field -> field.getName().equals(fieldName)).findFirst().orElse(null);
     }
 
-    private void initFormFieldTypes(FlowForm form, Map<String, DataType> types) {
+    private void initFormFieldDataTypes(FlowForm form, Map<String, DataType> types) {
         for (FormField field : form.getFields()) {
             String key = form.getCode() + "." + field.getCode();
-            DataType type = field.getType();
+            DataType type = field.getDataType();
             types.put(key, type);
         }
     }
@@ -121,15 +134,15 @@ private void initFormFieldTypes(FlowForm form, Map<String, DataType> types) {
      *
      * @return 表单字段类型
      */
-    public Map<String, DataType> loadAllFieldTypeMaps() {
+    public Map<String, DataType> loadAllFieldDataTypeMaps() {
         Map<String, DataType> types = new HashMap<>();
         List<FlowForm> forms = this.getSubForms();
         if (forms == null) {
             forms = new ArrayList<>();
         }
         forms.add(this);
         for (FlowForm subForm : forms) {
-            this.initFormFieldTypes(subForm, types);
+            this.initFormFieldDataTypes(subForm, types);
         }
         return types;
     }
@@ -145,7 +158,7 @@ public Map<String, DataType> loadMainFieldTypeMaps() {
         List<FlowForm> forms = new ArrayList<>();
         forms.add(this);
         for (FlowForm subForm : forms) {
-            this.initFormFieldTypes(subForm, types);
+            this.initFormFieldDataTypes(subForm, types);
         }
         return types;
     }

flow-engine-framework/src/main/java/com/codingapi/flow/form/FlowFormBuilder.java

@@ -1,6 +1,7 @@
 package com.codingapi.flow.form;
 
 import java.util.ArrayList;
+import java.util.Locale;
 
 public class FlowFormBuilder {
 
@@ -23,11 +24,12 @@ public FlowFormBuilder code(String code) {
         return this;
     }
 
-    public FlowFormBuilder addField(String name, String code, DataType type) {
+    public FlowFormBuilder addField(String name, String code, DataType dataType) {
         FormField field = new FormField();
         field.setName(name);
         field.setCode(code);
-        field.setType(type);
+        field.setDataType(dataType);
+        field.setType(dataType.name().toLowerCase(Locale.ROOT));
         field.setRequired(true);
         field.setDefaultValue(null);
         return this.addField(field);

flow-engine-framework/src/main/java/com/codingapi/flow/form/FormField.java

@@ -3,6 +3,8 @@
 import com.codingapi.flow.utils.RandomUtils;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 表单字段元数据
  */
@@ -16,7 +18,9 @@ public class FormField {
     // 字段编号
     private String code;
     // 字段类型
-    private DataType type;
+    private String type;
+    // 数据类型
+    private DataType dataType;
     // 是否隐藏
     private boolean hidden;
     // 是否必填
@@ -29,6 +33,9 @@ public class FormField {
     private String tooltip;
     // 帮助提示
     private String help;
+    // 附加属性
+    private List<FieldAttribute> attributes;
+
 
     public FormField() {
         this.id = RandomUtils.generateStringId();

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowRecordContent.java

@@ -18,7 +18,11 @@ public class FlowRecordContent {
     /**
      * 工作id
      */
-    private Long workBackupId;
+    private Long workflowRuntimeId;
+    /**
+     * 流程标题
+     */
+    private String workTitle;
     /**
      * 流程编码
      */
@@ -114,7 +118,7 @@ public class FlowRecordContent {
     public static FlowRecordContent convert(FlowRecord record){
         FlowRecordContent content = new FlowRecordContent();
         content.setProcessId(record.getProcessId());
-        content.setWorkBackupId(record.getWorkRuntimeId());
+        content.setWorkflowRuntimeId(record.getWorkRuntimeId());
         content.setWorkCode(record.getWorkCode());
         content.setNodeId(record.getNodeId());
         content.setNodeType(record.getNodeType());
@@ -139,7 +143,7 @@ public static FlowRecordContent convert(FlowRecord record){
     public static FlowRecordContent convert(FlowTodoRecord todoRecord){
         FlowRecordContent content = new FlowRecordContent();
         content.setProcessId(todoRecord.getProcessId());
-        content.setWorkBackupId(todoRecord.getWorkBackupId());
+        content.setWorkflowRuntimeId(todoRecord.getWorkflowRuntimeId());
         content.setWorkCode(todoRecord.getWorkCode());
         content.setNodeId(todoRecord.getNodeId());
         content.setNodeType(todoRecord.getNodeType());

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowRecord.java

@@ -48,6 +48,11 @@ public class FlowRecord {
      * 工作id
      */
     private long workRuntimeId;
+
+    /**
+     * 流程名称
+     */
+    private String workTitle;
     /**
      * 流程编码
      */
@@ -263,7 +268,8 @@ public FlowRecord(FlowSession flowSession, int nodeOrder) {
         // 获取转交之后的审批人
         IFlowOperator currentOperator = flowSession.loadFinalForwardOperator(sourceOperator);
         this.workCode = flowSession.getWorkCode();
-        this.workRuntimeId = flowSession.getBackupId();
+        this.workRuntimeId = flowSession.getWorkflowRuntimeId();
+        this.workTitle = flowSession.getWorkflow().getTitle();
         this.nodeId = flowSession.getCurrentNodeId();
         this.nodeType = flowSession.getCurrentNodeType();
         this.nodeName = flowSession.getCurrentNodeName();

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowTodoRecord.java

@@ -26,7 +26,12 @@ public class FlowTodoRecord {
     /**
      * 工作id
      */
-    private long workBackupId;
+    private long workflowRuntimeId;
+
+    /**
+     * 流程名称
+     */
+    private String workTitle;
     /**
      * 流程编码
      */
@@ -114,7 +119,8 @@ public FlowTodoRecord(FlowRecord flowRecord) {
 
     public void update(FlowRecord flowRecord) {
         this.processId = flowRecord.getProcessId();
-        this.workBackupId = flowRecord.getWorkRuntimeId();
+        this.workflowRuntimeId = flowRecord.getWorkRuntimeId();
+        this.workTitle = flowRecord.getWorkTitle();
         this.workCode = flowRecord.getWorkCode();
         this.nodeId = flowRecord.getNodeId();
         this.nodeType = flowRecord.getNodeType();

flow-engine-framework/src/main/java/com/codingapi/flow/session/FlowSession.java

@@ -63,7 +63,7 @@ public class FlowSession {
     /**
      * 流程备份id
      */
-    private final long backupId;
+    private final long workflowRuntimeId;
 
     /**
      * 审批意见
@@ -79,7 +79,7 @@ public FlowSession(IRepositoryHolder repositoryHolder,
                        FormData formData,
                        FlowRecord currentRecord,
                        List<FlowRecord> currentNodeRecords,
-                       long backupId,
+                       long workflowRuntimeId,
                        FlowAdvice advice) {
         this.repositoryHolder = repositoryHolder;
         this.currentOperator = currentOperator;
@@ -89,7 +89,7 @@ public FlowSession(IRepositoryHolder repositoryHolder,
         this.currentRecord = currentRecord;
         this.currentNodeRecords = currentNodeRecords;
         this.formData = formData;
-        this.backupId = backupId;
+        this.workflowRuntimeId = workflowRuntimeId;
         this.advice = advice;
     }
 
@@ -229,7 +229,7 @@ public Object getFormData(String fieldCode) {
      * @return 新的会话
      */
     public FlowSession updateSession(IFlowNode currentNode) {
-        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, backupId, advice);
+        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
     }
 
 
@@ -240,7 +240,7 @@ public FlowSession updateSession(IFlowNode currentNode) {
      * @return 新的会话
      */
     public FlowSession updateSession(IFlowAction currentAction) {
-        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, backupId, advice);
+        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
     }
 
     /**
@@ -250,7 +250,7 @@ public FlowSession updateSession(IFlowAction currentAction) {
      * @return 新的会话
      */
     public FlowSession updateSession(IFlowOperator currentOperator) {
-        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, backupId, advice);
+        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
     }
 
 }

flow-engine-framework/src/main/java/com/codingapi/flow/strategy/node/FormFieldPermissionStrategy.java

@@ -44,7 +44,7 @@ public FormFieldPermissionStrategy(List<FormFieldPermission> fieldPermissions) {
      */
     @Override
     public void verifyNode(FlowForm form) {
-        Map<String, DataType> fieldTypes = form.loadAllFieldTypeMaps();
+        Map<String, DataType> fieldTypes = form.loadAllFieldDataTypeMaps();
         if(fieldPermissions!=null) {
             for (FormFieldPermission permission : fieldPermissions) {
                 String key = permission.getFormCode() + "." + permission.getFieldCode();