Merge pull request #81 from codingapi/dev

Dev

Author: xlorne

flow-engine-example/src/main/java/com/codingapi/example/handler/MyFlowRecordUrgeEventHandler.java

@@ -0,0 +1,16 @@
+package com.codingapi.example.handler;
+
+import com.codingapi.flow.event.FlowRecordUrgeEvent;
+import com.codingapi.springboot.framework.event.IHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class MyFlowRecordUrgeEventHandler implements IHandler<FlowRecordUrgeEvent> {
+
+    @Override
+    public void handler(FlowRecordUrgeEvent event) {
+        log.info("催办 event:{}",event);
+    }
+}

flow-engine-framework/src/main/java/com/codingapi/flow/domain/UrgeInterval.java

@@ -21,6 +21,6 @@ public class UrgeInterval {
     public UrgeInterval(FlowRecord flowRecord) {
         this.processId = flowRecord.getProcessId();
         this.recordId = flowRecord.getId();
-        this.createTime = flowRecord.getCreateTime();
+        this.createTime = System.currentTimeMillis();
     }
 }

flow-engine-framework/src/main/java/com/codingapi/flow/exception/FlowStateException.java

@@ -114,7 +114,7 @@ public static FlowStateException nodeNotSupportRevoke() {
      *
      * @return exception
      */
-    public static FlowStateException recordNotSupportUrge() {
-        return new FlowStateException("record.notSupportUrge", "record not support urge");
+    public static FlowStateException recordLimitUrgeError() {
+        return new FlowStateException("record.urge.limit", "record urge limit error");
     }
 }

flow-engine-framework/src/main/java/com/codingapi/flow/manager/NodeStrategyManager.java

@@ -38,7 +38,7 @@ public long getTimeoutTime() {
     /**
      * 是否可合并
      */
-    public boolean isMergeable() {
+    public boolean isEnableMergeable() {
         List<INodeStrategy> strategies = this.strategies;
         for (INodeStrategy strategy : strategies) {
             if (strategy instanceof RecordMergeStrategy) {
@@ -48,6 +48,19 @@ public boolean isMergeable() {
         return false;
     }
 
+    /**
+     * 是否支持撤回
+     */
+    public boolean isEnableRevoke(){
+        List<INodeStrategy> strategies = this.strategies;
+        for (INodeStrategy strategy : strategies) {
+            if (strategy instanceof RevokeStrategy) {
+                return ((RevokeStrategy) strategy).isEnable();
+            }
+        }
+        return false;
+    }
+
     /**
      * 是否按顺序执行的审批策略
      */

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

@@ -64,7 +64,7 @@ public void fillNewRecord(FlowSession session, FlowRecord flowRecord) {
         NodeStrategyManager nodeStrategyManager = this.strategyManager();
         flowRecord.setTitle(nodeStrategyManager.generateTitle(session));
         flowRecord.setTimeoutTime(nodeStrategyManager.getTimeoutTime());
-        flowRecord.setMergeable(nodeStrategyManager.isMergeable());
+        flowRecord.setMergeable(nodeStrategyManager.isEnableMergeable());
         flowRecord.newRecord();
     }
 

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

@@ -93,7 +93,7 @@ public class FlowContent {
     /**
      * 流程按钮
      */
-    private List<Map<String,Object>> actions;
+    private List<Map<String, Object>> actions;
 
     /**
      * 是否可合并
@@ -130,6 +130,44 @@ public class FlowContent {
      */
     private List<NodeOption> nodes;
 
+    /**
+     * 支持撤销
+     */
+    private boolean revoke;
+
+    /**
+     * 支持催办
+     */
+    private boolean urge;
+
+
+    /**
+     * 设置操作动作按钮
+     *
+     */
+    public void setOperationAction(Workflow workflow, FlowRecord flowRecord) {
+        if (flowRecord == null) {
+            this.revoke = false;
+            this.urge = false;
+        } else {
+            if (flowRecord.isFinish()) {
+                this.revoke = false;
+                this.urge = false;
+            }
+
+            if (flowRecord.isTodo()) {
+                this.revoke = false;
+                this.urge = false;
+            }
+
+            if (flowRecord.isDone() && !flowRecord.isFinish()) {
+                IFlowNode node = workflow.getFlowNode(flowRecord.getNodeId());
+                this.revoke = node.strategyManager().isEnableRevoke();
+                this.urge = workflow.strategyManager().isEnableUrge();
+            }
+        }
+    }
+
 
     public void pushCurrentNode(IFlowNode currentNode) {
         ActionManager actionManager = currentNode.actionManager();
@@ -141,7 +179,7 @@ public void pushCurrentNode(IFlowNode currentNode) {
         this.nodeName = currentNode.getName();
         this.nodeType = currentNode.getType();
         this.fieldPermissions = strategyManager.getFieldPermissions();
-        Map<String,Object> nodeData = currentNode.toMap();
+        Map<String, Object> nodeData = currentNode.toMap();
         this.view = (String) nodeData.get("view");
     }
 
@@ -162,7 +200,7 @@ public void pushRecords(FlowRecord record, List<FlowRecord> mergeRecords) {
         this.title = record.getTitle();
 
         this.todos = new ArrayList<>();
-        for (FlowRecord item : mergeRecords){
+        for (FlowRecord item : mergeRecords) {
             Body body = new Body();
             body.setRecordId(item.getId());
             body.setTitle(item.getTitle());
@@ -173,9 +211,9 @@ public void pushRecords(FlowRecord record, List<FlowRecord> mergeRecords) {
         }
     }
 
-    public void pushHistory(Workflow workflow,List<FlowRecord> historyRecords) {
+    public void pushHistory(Workflow workflow, List<FlowRecord> historyRecords) {
         this.histories = new ArrayList<>();
-        for (FlowRecord item : historyRecords){
+        for (FlowRecord item : historyRecords) {
             IFlowNode node = workflow.getFlowNode(item.getNodeId());
             History history = new History();
             history.setRecordId(item.getId());
@@ -193,18 +231,18 @@ public void pushHistory(Workflow workflow,List<FlowRecord> historyRecords) {
 
     public void pushCurrentOperator(IFlowOperator currentOperator) {
         this.currentOperator = new FlowOperator(currentOperator);
-        this.createOperator =  new FlowOperator(currentOperator);
+        this.createOperator = new FlowOperator(currentOperator);
     }
 
 
     @Data
-    public static class History{
+    public static class History {
         /**
          * 流程编号
          */
         private long recordId;
         /**
-         *  流程标题
+         * 流程标题
          */
         private String title;
 
@@ -246,15 +284,15 @@ public static class History{
     @Data
     public static class Body {
         /**
-         *  流程记录编号
+         * 流程记录编号
          */
         private long recordId;
         /**
-         *  流程标题
+         * 流程标题
          */
         private String title;
         /**
-         *  表单数据
+         * 表单数据
          */
         private Map<String, Object> data;
 

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

@@ -210,7 +210,7 @@ public class FlowRecord {
     private long timeoutTime;
     /**
      * 是否可合并
-     * {@link FlowRecord#getMergeKey()}
+     * {@link FlowRecord#getTodoKey()}
      */
     private boolean mergeable;
     /**
@@ -247,7 +247,7 @@ public class FlowRecord {
      * 数据合并的依据,当开启时值为固定值，否则为随机数据
      * 相同的 {@link FlowRecord#currentOperatorId} {@link FlowRecord#workRuntimeId} {@link FlowRecord#nodeId}字段的数据合并到一条记录上。
      */
-    public String getMergeKey() {
+    public String getTodoKey() {
         if (mergeable) {
             return String.format("%s-%s-%s", currentOperatorId, workRuntimeId, nodeId);
         } else {
@@ -461,7 +461,7 @@ public void notifyRecord(FlowSession flowSession) {
         NodeStrategyManager nodeStrategyManager = currentNode.strategyManager();
         this.setTitle(nodeStrategyManager.generateTitle(flowSession));
         this.setTimeoutTime(nodeStrategyManager.getTimeoutTime());
-        this.setMergeable(nodeStrategyManager.isMergeable());
+        this.setMergeable(nodeStrategyManager.isEnableMergeable());
         this.update(flowSession, true);
         this.notify = true;
         this.forwardOperatorId = 0;

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

@@ -80,7 +80,7 @@ public class FlowTodoRecord {
 
     /**
      * 合并记录id,当存在合并记录数据时待办记录数量不会增加，内容会更新至最新的待办数据信息。
-     * {@link FlowRecord#getMergeKey()}
+     * {@link FlowRecord#getTodoKey()}
      */
     private String mergeKey;
 
@@ -126,7 +126,7 @@ public void update(FlowRecord flowRecord) {
         this.createTime = flowRecord.getCreateTime();
         this.createOperatorId = flowRecord.getCreateOperatorId();
         this.createOperatorName = flowRecord.getCreateOperatorName();
-        this.mergeKey = flowRecord.getMergeKey();
+        this.mergeKey = flowRecord.getTodoKey();
         this.mergeable = flowRecord.isMergeable();
         this.recordId = flowRecord.getId();
         this.timeoutTime = flowRecord.getTimeoutTime();

flow-engine-framework/src/main/java/com/codingapi/flow/repository/FlowTodoRecordRepository.java

@@ -8,7 +8,7 @@ public interface FlowTodoRecordRepository {
 
     void saveAll(List<FlowTodoRecord> margeRecords);
 
-    FlowTodoRecord getByMergeKey(String key);
+    FlowTodoRecord getByTodoKey(String key);
 
     void delete(FlowTodoRecord margeRecord);
 

flow-engine-framework/src/main/java/com/codingapi/flow/service/FlowRecordSaveService.java

@@ -44,7 +44,7 @@ private void saveTodoMargeRecords() {
         List<FlowTodoRecord> flowTodoRecords = new ArrayList<>();
         for (FlowRecord flowRecord : flowRecords) {
             if (flowRecord.isTodo()) {
-                FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
+                FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey());
                 if (todoMargeRecord == null) {
                     todoMargeRecord = new FlowTodoRecord(flowRecord);
                 } else {
@@ -83,7 +83,7 @@ private void removeTodoMergeRecords() {
         for (FlowRecord flowRecord : flowRecords) {
             if (flowRecord.isDone()) {
                 if (flowRecord.isMergeable()) {
-                    FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
+                    FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey());
                     if (todoMargeRecord != null) {
                         List<FlowTodoMerge> margeRelations = flowTodoMergeRepository.findByTodoId(todoMargeRecord.getId());
                         if (margeRelations != null && !margeRelations.isEmpty()) {
@@ -101,7 +101,14 @@ private void removeTodoMergeRecords() {
                         }
                     }
                 } else {
-                    FlowTodoRecord flowTodoRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
+                    FlowTodoRecord flowTodoRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey());
+                    if (flowTodoRecord != null) {
+                        flowTodoRecordRepository.delete(flowTodoRecord);
+                    }
+                }
+            }else {
+                if(flowRecord.isRevoked()){
+                    FlowTodoRecord flowTodoRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey());
                     if (flowTodoRecord != null) {
                         flowTodoRecordRepository.delete(flowTodoRecord);
                     }