merge flow record

xlorne · xlorne · commit a11dcebdae24 · 2025-05-28T19:53:27.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.36</version>
+    <version>2.10.0</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.36</version>
+        <version>2.10.0</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.36</version>
+        <version>2.10.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.36</version>
+        <version>2.10.0</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/build/FlowWorkBuilder.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/build/FlowWorkBuilder.java
@@ -73,43 +73,47 @@ public FlowWork build() {
 
     public class Nodes {
 
-        public Nodes node(String id, String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, long timeout, TitleGenerator titleGenerator, ErrTrigger errTrigger, boolean editable, List<FlowButton> buttons) {
-            FlowNode node = new FlowNode(id, name, code, view, NodeType.parser(code), approvalType, titleGenerator, operatorMatcher, timeout, errTrigger, editable, buttons);
+        public Nodes node(String id, String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, long timeout, TitleGenerator titleGenerator, ErrTrigger errTrigger, boolean editable, boolean mergeable, List<FlowButton> buttons) {
+            FlowNode node = new FlowNode(id, name, code, view, NodeType.parser(code), approvalType, titleGenerator, operatorMatcher, timeout, errTrigger, editable,mergeable, buttons);
             work.addNode(node);
             return this;
         }
 
         public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, long timeout, boolean editable) {
-            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, timeout, TitleGenerator.defaultTitleGenerator(), null, editable, null);
+            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, timeout, TitleGenerator.defaultTitleGenerator(), null, editable,false, null);
         }
 
-        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, long timeout, boolean editable, List<FlowButton> buttons) {
-            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, timeout, TitleGenerator.defaultTitleGenerator(), null, editable, buttons);
+        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, long timeout, boolean editable,boolean mergeable) {
+            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, timeout, TitleGenerator.defaultTitleGenerator(), null, editable,mergeable, null);
+        }
+
+        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, long timeout, boolean editable,boolean mergeable, List<FlowButton> buttons) {
+            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, timeout, TitleGenerator.defaultTitleGenerator(), null, editable,mergeable, buttons);
         }
 
 
-        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, boolean editable) {
-            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, 0, TitleGenerator.defaultTitleGenerator(), null, editable, null);
+        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, boolean editable,boolean mergeable) {
+            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, 0, TitleGenerator.defaultTitleGenerator(), null, editable,mergeable, null);
         }
 
-        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, boolean editable, List<FlowButton> buttons) {
-            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, 0, TitleGenerator.defaultTitleGenerator(), null, editable, buttons);
+        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, boolean editable,boolean mergeable, List<FlowButton> buttons) {
+            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, 0, TitleGenerator.defaultTitleGenerator(), null, editable,mergeable, buttons);
         }
 
         public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, List<FlowButton> buttons) {
-            return node(name, code, view, approvalType, operatorMatcher, true, buttons);
+            return node(name, code, view, approvalType, operatorMatcher, true,false, buttons);
         }
 
         public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher) {
-            return node(name, code, view, approvalType, operatorMatcher, true, null);
+            return node(name, code, view, approvalType, operatorMatcher, true,false, null);
         }
 
-        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, ErrTrigger errTrigger, boolean editable, List<FlowButton> buttons) {
-            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, 0, TitleGenerator.defaultTitleGenerator(), errTrigger, editable, buttons);
+        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, ErrTrigger errTrigger, boolean editable,boolean mergeable, List<FlowButton> buttons) {
+            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, 0, TitleGenerator.defaultTitleGenerator(), errTrigger, editable,mergeable, buttons);
         }
 
-        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, ErrTrigger errTrigger, boolean editable) {
-            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, 0, TitleGenerator.defaultTitleGenerator(), errTrigger, editable, null);
+        public Nodes node(String name, String code, String view, ApprovalType approvalType, OperatorMatcher operatorMatcher, ErrTrigger errTrigger, boolean editable,boolean mergeable) {
+            return node(RandomGenerator.generateUUID(), name, code, view, approvalType, operatorMatcher, 0, TitleGenerator.defaultTitleGenerator(), errTrigger, editable,mergeable, null);
         }
 
 
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/build/SchemaReader.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/build/SchemaReader.java
@@ -48,6 +48,7 @@ private void loadNodes() {
             String titleGenerator = properties.getString("titleGenerator");
             String name = properties.getString("name");
             boolean editable = properties.getBoolean("editable");
+            boolean mergeable = properties.getBoolean("mergeable");
             String view = properties.getString("view");
             String type = properties.getString("type");
             String approvalType = properties.getString("approvalType");
@@ -59,7 +60,7 @@ private void loadNodes() {
                 buttons = properties.getJSONArray("buttons").toJavaList(FlowButton.class);
             }
             FlowNode flowNode = new FlowNode(id, name, code, view, NodeType.parser(type), ApprovalType.parser(approvalType), new TitleGenerator(titleGenerator),
-                    new OperatorMatcher(operatorMatcher), timeout, StringUtils.hasLength(errTrigger) ? new ErrTrigger(errTrigger) : null, editable, buttons);
+                    new OperatorMatcher(operatorMatcher), timeout, StringUtils.hasLength(errTrigger) ? new ErrTrigger(errTrigger) : null, editable,mergeable, buttons);
             flowNodes.add(flowNode);
         }
     }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowNode.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowNode.java
@@ -78,6 +78,14 @@ public class FlowNode {
      */
     private boolean editable;
 
+    /**
+     * 是否合并记录
+     * <p>
+     * 如果为true，则表示该节点可以合并记录
+     */
+    private boolean mergeable;
+
+
     /**
      * 创建时间
      */
@@ -148,6 +156,7 @@ public FlowNodeSerializable toSerializable() {
                 this.approvalType,
                 this.operatorMatcher.getScript(),
                 this.editable,
+                this.mergeable,
                 this.createTime,
                 this.updateTime,
                 this.timeout,
@@ -168,6 +177,7 @@ public FlowNode(String id,
                     long timeout,
                     ErrTrigger errTrigger,
                     boolean editable,
+                    boolean mergeable,
                     List<FlowButton> buttons) {
         this.id = id;
         this.code = code;
@@ -182,6 +192,7 @@ public FlowNode(String id,
         this.errTrigger = errTrigger;
         this.timeout = timeout;
         this.editable = editable;
+        this.mergeable = mergeable;
         this.buttons = buttons;
     }
 
@@ -229,6 +240,7 @@ public FlowRecord createRecord(long workId,
         FlowRecord record = new FlowRecord();
         record.setProcessId(processId);
         record.setNodeCode(this.code);
+        record.setMergeable(this.mergeable);
         record.setCreateTime(System.currentTimeMillis());
         record.setWorkId(workId);
         record.setWorkCode(workCode);
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/pojo/FlowDetail.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/pojo/FlowDetail.java
@@ -5,6 +5,7 @@
 import com.codingapi.springboot.flow.domain.FlowNode;
 import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.domain.Opinion;
+import com.codingapi.springboot.flow.record.FlowMerge;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.user.IFlowOperator;
 import lombok.Getter;
@@ -64,15 +65,22 @@ public class FlowDetail {
      */
     private final boolean canHandle;
 
+    /**
+     * 合并记录
+     */
+    private final List<FlowMerge> mergeRecords;
+
 
     public FlowDetail(FlowRecord flowRecord,
+                      List<FlowMerge> mergeRecords,
                       BindDataSnapshot snapshot,
                       FlowWork flowWork,
                       List<FlowRecord> historyRecords,
                       List<? extends IFlowOperator> operators,
                       boolean canHandle) {
         this.operators = operators;
         this.flowRecord = flowRecord;
+        this.mergeRecords = mergeRecords;
         this.flowWork = flowWork;
         this.bindData = snapshot.toBindData();
         this.historyRecords = historyRecords;
@@ -92,6 +100,7 @@ public FlowDetail(FlowWork flowWork,
         this.operators = operators;
         this.flowCreateTime = 0;
         this.flowRecord = null;
+        this.mergeRecords = null;
         this.historyRecords = null;
         this.bindData = null;
         this.opinions = null;
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowMerge.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowMerge.java
@@ -0,0 +1,14 @@
+package com.codingapi.springboot.flow.record;
+
+import com.codingapi.springboot.flow.bind.IBindData;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class FlowMerge {
+
+    private final FlowRecord flowRecord;
+    private final IBindData bindData;
+
+}
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowRecord.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowRecord.java
@@ -49,6 +49,12 @@ public class FlowRecord {
      */
     private String nodeCode;
 
+
+    /**
+     * 是否可合并
+     */
+    private boolean mergeable;
+
     /**
      * 流程标题
      */
@@ -402,6 +408,7 @@ public FlowRecord copy() {
         record.setWorkCode(this.workCode);
         record.setProcessId(this.processId);
         record.setNodeCode(this.nodeCode);
+        record.setMergeable(this.mergeable);
         record.setTitle(this.title);
         record.setCurrentOperator(this.currentOperator);
         record.setFlowType(this.flowType);
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/repository/FlowRecordRepository.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/repository/FlowRecordRepository.java
@@ -48,6 +48,15 @@ public interface FlowRecordRepository {
      */
     List<FlowRecord> findFlowRecordByProcessId(String processId);
 
+    /**
+     * 获取合并的流程记录
+     * @param workCode 流程编码
+     * @param nodeCode 节点编码
+     * @param currentOperatorId 当前操作者ID
+     * @return List of FlowRecord
+     */
+    List<FlowRecord> findMergeFlowRecordById(String workCode,String nodeCode,long currentOperatorId);
+
 
     /**
      * 查询所有未完成的流程记录
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/serializable/FlowNodeSerializable.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/serializable/FlowNodeSerializable.java
@@ -69,6 +69,11 @@ public class FlowNodeSerializable implements Serializable {
      */
     private boolean editable;
 
+    /**
+     * 是否可合并审批
+     */
+    private boolean mergeable;
+
     /**
      * 创建时间
      */
@@ -95,6 +100,6 @@ public class FlowNodeSerializable implements Serializable {
 
     public FlowNode toFlowNode() {
         return new FlowNode(id, code, name, new TitleGenerator(titleGenerator), type, view, approvalType,
-                new OperatorMatcher(operatorMatcher), editable, createTime, updateTime, timeout, errTrigger == null ? null : new ErrTrigger(errTrigger),buttons);
+                new OperatorMatcher(operatorMatcher), editable, mergeable, createTime, updateTime, timeout, errTrigger == null ? null : new ErrTrigger(errTrigger), buttons);
     }
 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowDetailService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowDetailService.java
@@ -5,6 +5,7 @@
 import com.codingapi.springboot.flow.domain.FlowNode;
 import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.pojo.FlowDetail;
+import com.codingapi.springboot.flow.record.FlowMerge;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.repository.*;
 import com.codingapi.springboot.flow.service.FlowRecordVerifyService;
@@ -46,6 +47,16 @@ public FlowDetail detail(long recordId, IFlowOperator currentOperator) {
         FlowRecord flowRecord = flowRecordVerifyService.getFlowRecord();
         FlowWork flowWork = flowRecordVerifyService.getFlowWork();
 
+        List<FlowMerge> mergeRecords = null;
+        if(flowRecord.isTodo() && flowRecord.isMergeable()){
+            List<FlowRecord> flowRecords = flowRecordRepository.findMergeFlowRecordById(flowRecord.getWorkCode(),flowRecord.getNodeCode(),currentOperator.getUserId());
+            if(!flowRecords.isEmpty()){
+                mergeRecords = flowRecords.stream().map(record->{
+                    BindDataSnapshot bindDataSnapshot = flowBindDataRepository.getBindDataSnapshotById(record.getSnapshotId());
+                    return new FlowMerge(record,bindDataSnapshot.toBindData());
+                }).collect(Collectors.toList());
+            }
+        }
 
         BindDataSnapshot snapshot = flowBindDataRepository.getBindDataSnapshotById(flowRecord.getSnapshotId());
         List<FlowRecord> flowRecords =
@@ -64,7 +75,7 @@ public FlowDetail detail(long recordId, IFlowOperator currentOperator) {
             }
         }
 
-        return new FlowDetail(flowRecord, snapshot, flowWork, flowRecords, operators, currentOperator != null && flowRecord.isTodo() && flowRecord.isOperator(currentOperator));
+        return new FlowDetail(flowRecord,mergeRecords, snapshot, flowWork, flowRecords, operators, currentOperator != null && flowRecord.isTodo() && flowRecord.isOperator(currentOperator));
     }
 
 
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/repository/FlowRecordRepositoryImpl.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/repository/FlowRecordRepositoryImpl.java
@@ -43,6 +43,17 @@ public List<FlowRecord> findFlowRecordByPreId(long preId) {
         return cache.stream().filter(record -> record.getPreId() == preId).collect(Collectors.toList());
     }
 
+    @Override
+    public List<FlowRecord> findMergeFlowRecordById(String workCode, String nodeCode, long operatorId) {
+        return cache.stream()
+                .filter(record -> record.isTodo() && record.getCurrentOperator().getUserId() == operatorId
+                        && record.getWorkCode().equals(workCode)
+                        && record.getNodeCode().equals(nodeCode)
+                        && record.isMergeable()
+                )
+                .collect(Collectors.toList());
+    }
+
     @Override
     public List<FlowRecord> findFlowRecordByProcessId(String processId) {
         return cache.stream().filter(record -> record.getProcessId().equals(processId))
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/ErrorTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/ErrorTest.java
@@ -53,7 +53,7 @@ void errorMatcherOperatorTest(){
                 .title("请假流程")
                 .nodes()
                 .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
-                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, new OperatorMatcher("def run(content){return []}"), new ErrTrigger("def run(content){return content.createOperatorErrTrigger("+dept.getId()+")}"), true)
+                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, new OperatorMatcher("def run(content){return []}"), new ErrTrigger("def run(content){return content.createOperatorErrTrigger("+dept.getId()+")}"), true,false)
                 .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
                 .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
                 .relations()
@@ -145,7 +145,7 @@ void errorMatcherNodeTest(){
                 .title("请假流程")
                 .nodes()
                 .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
-                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, new OperatorMatcher("def run(content){return []}"), new ErrTrigger("def run(content){return content.createNodeErrTrigger('manager')}"), true)
+                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, new OperatorMatcher("def run(content){return []}"), new ErrTrigger("def run(content){return content.createNodeErrTrigger('manager')}"), true,false)
                 .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
                 .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
                 .relations()
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest.java
@@ -388,7 +388,7 @@ void saveDisableTest() {
                 .title("请假流程")
                 .nodes()
                 .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
-                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(dept.getUserId()), false)
+                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(dept.getUserId()), false,false)
                 .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
                 .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
                 .relations()
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/ScriptBuildTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/ScriptBuildTest.java
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
diff --git a/springboot-starter/src/main/resources/META-INF/banner.txt b/springboot-starter/src/main/resources/META-INF/banner.txt

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ private void loadNodes() {`
`48`	`48`	`String titleGenerator = properties.getString("titleGenerator");`
`49`	`49`	`String name = properties.getString("name");`
`50`	`50`	`boolean editable = properties.getBoolean("editable");`
	`51`	`+ boolean mergeable = properties.getBoolean("mergeable");`
`51`	`52`	`String view = properties.getString("view");`
`52`	`53`	`String type = properties.getString("type");`
`53`	`54`	`String approvalType = properties.getString("approvalType");`
`@@ -59,7 +60,7 @@ private void loadNodes() {`
`59`	`60`	`buttons = properties.getJSONArray("buttons").toJavaList(FlowButton.class);`
`60`	`61`	`}`
`61`	`62`	`FlowNode flowNode = new FlowNode(id, name, code, view, NodeType.parser(type), ApprovalType.parser(approvalType), new TitleGenerator(titleGenerator),`
`62`		`- new OperatorMatcher(operatorMatcher), timeout, StringUtils.hasLength(errTrigger) ? new ErrTrigger(errTrigger) : null, editable, buttons);`
	`63`	`+ new OperatorMatcher(operatorMatcher), timeout, StringUtils.hasLength(errTrigger) ? new ErrTrigger(errTrigger) : null, editable,mergeable, buttons);`
`63`	`64`	`flowNodes.add(flowNode);`
`64`	`65`	`}`
`65`	`66`	`}`