update end node sync record data

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/action/actions/PassAction.java

@@ -127,7 +127,6 @@ public void run(FlowSession flowSession) {
                 });
             }
         }
-
         RepositoryHolderContext.getInstance().saveRecords(recordList);
 
         flowEvents.forEach(EventPusher::push);

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

@@ -13,8 +13,12 @@
 import com.codingapi.flow.utils.RandomUtils;
 import com.codingapi.springboot.framework.event.EventPusher;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * 结束节点
@@ -24,6 +28,8 @@ public class EndNode extends BaseFlowNode implements IDisplayNode {
     public static final String NODE_TYPE = NodeType.END.name();
     public static final String DEFAULT_NAME = "结束节点";
 
+    private final ScheduledExecutorService threadPools = Executors.newScheduledThreadPool(1);
+
     @Override
     public String getType() {
         return NODE_TYPE;
@@ -47,17 +53,30 @@ public void fillNewRecord(FlowSession session, FlowRecord flowRecord) {
         IFlowAction currentAction = session.getCurrentAction();
         // 标记当前流程结束
         FlowRecord latestRecord = session.getCurrentRecord();
+
         // 添加历史记录到记录中
         List<FlowRecord> historyRecords = RepositoryHolderContext.getInstance().findProcessRecords(latestRecord.getProcessId());
+
+        // 同步当前处理的FlowRecord的数据
+        List<FlowRecord> recordList = new ArrayList<>();
+        for (FlowRecord historyRecord:historyRecords){
+            if(historyRecord.getId()== latestRecord.getId()){
+                recordList.add(latestRecord);
+            }else {
+                recordList.add(historyRecord);
+            }
+        }
+
         // 设置状态为完成
-        historyRecords.forEach(item -> {
+        recordList.forEach(item -> {
             item.finish(currentAction instanceof PassAction);
         });
-        RepositoryHolderContext.getInstance().saveRecords(historyRecords);
+        RepositoryHolderContext.getInstance().saveRecords(recordList);
         // 流程是否正常结束
         EventPusher.push(new FlowRecordFinishEvent(latestRecord));
     }
 
+
     @Override
     public boolean handle(FlowSession session) {
         return false;
@@ -75,6 +94,46 @@ public static EndNode formMap(Map<String, Object> map) {
         return BaseFlowNode.fromMap(map, EndNode.class);
     }
 
+
+    private static class RecordMergeHelper {
+
+        private final List<FlowRecord> currentRecords;
+        private final List<FlowRecord> historyRecords;
+
+        private final Map<Long,FlowRecord> currentRecordCache;
+
+        private final List<FlowRecord> recordList;
+
+        public RecordMergeHelper(List<FlowRecord> historyRecords, List<FlowRecord> currentRecords) {
+            this.historyRecords = historyRecords;
+            this.currentRecords = currentRecords;
+            this.currentRecordCache = new HashMap<>();
+            this.recordList = new ArrayList<>();
+            this.initCurrentRecordCache();
+        }
+
+        private void initCurrentRecordCache(){
+            for (FlowRecord currentRecord:this.currentRecords){
+                this.currentRecordCache.put(currentRecord.getId(),currentRecord);
+            }
+        }
+
+        public List<FlowRecord> getUpdateRecordList() {
+            for(FlowRecord historyRecord:historyRecords){
+                FlowRecord currentRecord =  this.currentRecordCache.get(historyRecord.getId());
+                if(currentRecord!=null){
+                    this.recordList.add(currentRecord);
+                }else {
+                    this.recordList.add(historyRecord);
+                }
+            }
+            return this.recordList;
+        }
+
+
+
+    }
+
     public static Builder builder() {
         return new Builder();
     }