add FlowNodeService

Author: xlorne

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowNode.java

@@ -303,4 +303,11 @@ public boolean isOverNode() {
     public boolean isStartNode() {
         return CODE_START.equals(this.code);
     }
+
+    /**
+     * 是否抄送节点
+     */
+    public boolean isCC() {
+        return approvalType == ApprovalType.CC;
+    }
 }

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/ApprovalType.java

@@ -12,7 +12,11 @@ public enum ApprovalType {
     /**
      * 非会签
      */
-    UN_SIGN;
+    UN_SIGN,
+    /**
+     * 抄送
+     */
+    CC;
 
 
     public static ApprovalType parser(String approvalType) {

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/FlowSourceDirection.java

@@ -15,7 +15,7 @@ public enum FlowSourceDirection {
      */
     REJECT,
     /**
-     *
+     * 转办
      */
     TRANSFER;
 

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/FlowType.java

@@ -13,6 +13,10 @@ public enum FlowType {
      * 已办
      */
     DONE,
+    /**
+     * 抄送
+     */
+    CC,
     /**
      * 转办
      */

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/NodeType.java

@@ -13,6 +13,10 @@ public enum NodeType {
      * 审批
      */
     APPROVAL,
+    /**
+     * 抄送
+     */
+    CC,
     /**
      * 结束
      */

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/event/FlowApprovalEvent.java

@@ -32,6 +32,8 @@ public class FlowApprovalEvent implements ISyncEvent {
     public static final int STATE_TODO = 7;
     // 催办
     public static final int STATE_URGE = 8;
+    // 抄送
+    public static final int STATE_CC = 9;
 
 
     private final int state;

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowDirectionService.java

@@ -112,7 +112,7 @@ public boolean isDefaultBackRecord() {
     /**
      * 判断当前流程是否为通过流程
      */
-    public boolean isPassBackRecord() {
+    public boolean isPassRecord() {
         return flowSourceDirection == FlowSourceDirection.PASS;
     }
 

…ow/service/FlowRecordBuilderService.java …ngboot/flow/service/FlowNodeService.javaspringboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordBuilderService.java renamed to springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordBuilderService.java renamed to springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java

@@ -18,10 +18,12 @@
 import java.util.List;
 
 /**
- *  流程记录构建服务
+ * 流程节点服务
  */
-class FlowRecordBuilderService {
+class FlowNodeService {
 
+    private FlowNode nextNode;
+    private IFlowOperator nextOperator;
 
     private final FlowOperatorRepository flowOperatorRepository;
     private final FlowRecordRepository flowRecordRepository;
@@ -37,34 +39,77 @@ class FlowRecordBuilderService {
     private final IFlowOperator createOperator;
 
 
-    public FlowRecordBuilderService(FlowOperatorRepository flowOperatorRepository,
-                                    FlowRecordRepository flowRecordRepository,
-                                    BindDataSnapshot snapshot,
-                                    Opinion opinion,
-                                    IFlowOperator createOperator,
-                                    IFlowOperator currentOperator,
-                                    List<FlowRecord> historyRecords,
-                                    FlowWork flowWork,
-                                    String processId,
-                                    long preId) {
+    public FlowNodeService(FlowOperatorRepository flowOperatorRepository,
+                           FlowRecordRepository flowRecordRepository,
+                           BindDataSnapshot snapshot,
+                           Opinion opinion,
+                           IFlowOperator createOperator,
+                           IFlowOperator currentOperator,
+                           List<FlowRecord> historyRecords,
+                           FlowWork flowWork,
+                           String processId,
+                           long preId){
 
-        if(createOperator==null){
-            throw new IllegalArgumentException("createOperator is null");
-        }
-
-        this.createOperator = createOperator;
         this.flowOperatorRepository = flowOperatorRepository;
-
         this.flowRecordRepository = flowRecordRepository;
         this.snapshot = snapshot;
         this.opinion = opinion;
+        this.createOperator = createOperator;
         this.currentOperator = currentOperator;
+        this.historyRecords = historyRecords;
         this.flowWork = flowWork;
-
-
         this.processId = processId;
         this.preId = preId;
-        this.historyRecords = historyRecords;
+    }
+
+
+    public void setNextNode(FlowNode nextNode) {
+        this.nextNode = nextNode;
+        this.nextOperator = currentOperator;
+    }
+
+
+    public void loadNextPassNode(FlowNode currentNode){
+        this.nextNode = matcherNextNode(currentNode, false);
+        this.nextOperator = currentOperator;
+    }
+
+    public void loadDefaultBackNode(long parentRecordId){
+        IFlowOperator flowOperator;
+        // 拒绝时，默认返回上一个已办节点
+        FlowRecord preRecord = flowRecordRepository.getFlowRecordById(parentRecordId);
+        // 只寻找已办节点
+        while (!preRecord.isDone()) {
+            // 继续寻找上一个节点
+            preRecord = flowRecordRepository.getFlowRecordById(preRecord.getPreId());
+        }
+        // 获取上一个节点的审批者，继续将审批者设置为当前审批者
+        flowOperator = preRecord.getCurrentOperator();
+        FlowNode nextNode = flowWork.getNodeByCode(preRecord.getNodeCode());
+        if (nextNode == null) {
+            throw new IllegalArgumentException("next node not found");
+        }
+        this.nextNode = nextNode;
+        this.nextOperator = flowOperator;
+    }
+
+
+    public void loadCustomBackNode(FlowNode flowNode, long parentRecordId){
+        FlowNode nextNode = this.matcherNextNode(flowNode, true);
+        if (nextNode == null) {
+            throw new IllegalArgumentException("next node not found");
+        }
+        IFlowOperator flowOperator = currentOperator;
+        if (nextNode.isAnyOperatorMatcher()) {
+            // 如果是任意人员操作时则需要指定为当时审批人员为当前审批人员
+            FlowRecord preFlowRecord = flowRecordRepository.getFlowRecordById(parentRecordId);
+            while (preFlowRecord.isTransfer() || !preFlowRecord.getNodeCode().equals(nextNode.getCode())) {
+                preFlowRecord = flowRecordRepository.getFlowRecordById(preFlowRecord.getPreId());
+            }
+            flowOperator = preFlowRecord.getCurrentOperator();
+        }
+        this.nextNode = nextNode;
+        this.nextOperator = flowOperator;
     }
 
 
@@ -96,6 +141,41 @@ private FlowNode matcherNextNode(FlowNode flowNode, boolean back) {
         return flowNodes.get(0);
     }
 
+
+    /**
+     * 创建流程记录
+     *
+     * @return 流程记录
+     */
+    public List<FlowRecord> createRecord() {
+
+        FlowSession flowSession = new FlowSession(flowWork,
+                nextNode,
+                createOperator,
+                nextOperator,
+                snapshot.toBindData(),
+                opinion,
+                historyRecords);
+
+        long workId = flowWork.getId();
+        List<? extends IFlowOperator> operators = nextNode.loadFlowNodeOperator(flowSession, flowOperatorRepository);
+        List<FlowRecord> recordList;
+        if (operators.isEmpty()) {
+            recordList= this.errMatcher(nextNode, nextOperator);
+            if (recordList.isEmpty()) {
+                throw new IllegalArgumentException("operator not match.");
+            }
+        } else {
+            String recordTitle = nextNode.generateTitle(flowSession);
+            recordList = new ArrayList<>();
+            for (IFlowOperator operator : operators) {
+                FlowRecord record = nextNode.createRecord(workId,flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot);
+                recordList.add(record);
+            }
+        }
+        return recordList;
+    }
+
     /**
      * 异常匹配
      *
@@ -150,101 +230,17 @@ private List<FlowRecord> errMatcher(FlowNode currentNode, IFlowOperator currentO
 
 
     /**
-     * 创建流程记录
-     *
-     * @param currentNode 当前节点
-     * @return 流程记录
-     */
-    public List<FlowRecord> createRecord(FlowNode currentNode, IFlowOperator currentOperator) {
-       return this.createRecord(currentNode,currentOperator,null);
-    }
-
-    /**
-     * 创建流程记录
-     *
-     * @param currentNode       当前节点
-     * @param currentOperator   当前审批人
-     * @param opinion           审批意见
-     * @return 流程记录
-     */
-    public List<FlowRecord> createRecord(FlowNode currentNode, IFlowOperator currentOperator,Opinion opinion) {
-        FlowSession flowSession = new FlowSession(flowWork, currentNode, createOperator, currentOperator, snapshot.toBindData(), opinion, historyRecords);
-        long workId = flowWork.getId();
-        List<? extends IFlowOperator> operators = currentNode.loadFlowNodeOperator(flowSession, flowOperatorRepository);
-        List<FlowRecord> recordList;
-        if (operators.isEmpty()) {
-            recordList= this.errMatcher(currentNode, currentOperator);
-            if (recordList.isEmpty()) {
-                throw new IllegalArgumentException("operator not match.");
-            }
-        } else {
-            String recordTitle = currentNode.generateTitle(flowSession);
-            recordList = new ArrayList<>();
-            for (IFlowOperator operator : operators) {
-                FlowRecord record = currentNode.createRecord(workId,flowWork.getCode(), processId, preId, recordTitle, createOperator, operator, snapshot);
-                recordList.add(record);
-            }
-        }
-        if(!recordList.isEmpty()){
-            for (FlowRecord record:recordList){
-                if(opinion!=null){
-                    record.updateOpinion(opinion);
-                }
-            }
-        }
-
-        return recordList;
-    }
-
-
-    /**
-     * 创建下一个节点
+     * 下一节点的类型
      */
-    public List<FlowRecord> createNextRecord(FlowNode flowNode) {
-        FlowNode nextNode = this.matcherNextNode(flowNode, false);
-        return this.createRecord(nextNode, currentOperator);
+    public boolean nextNodeIsCC() {
+        return nextNode.isCC();
     }
 
-    /**
-     * 创建自定义的下级别节点
-     */
-    public List<FlowRecord> createCustomBackRecord(FlowNode flowNode, long parentRecordId) {
-        FlowNode nextNode = this.matcherNextNode(flowNode, true);
-        if (nextNode == null) {
-            throw new IllegalArgumentException("next node not found");
-        }
-        IFlowOperator flowOperator = currentOperator;
-        if (nextNode.isAnyOperatorMatcher()) {
-            // 如果是任意人员操作时则需要指定为当时审批人员为当前审批人员
-            FlowRecord preFlowRecord = flowRecordRepository.getFlowRecordById(parentRecordId);
-            while (preFlowRecord.isTransfer() || !preFlowRecord.getNodeCode().equals(nextNode.getCode())) {
-                preFlowRecord = flowRecordRepository.getFlowRecordById(preFlowRecord.getPreId());
-            }
-            flowOperator = preFlowRecord.getCurrentOperator();
-        }
-        return this.createRecord(nextNode, flowOperator);
-    }
 
     /**
-     * 创建默认拒绝时的流程记录
+     * 下一节点是否结束节点
      */
-    public List<FlowRecord> createDefaultBackRecord(long parentRecordId) {
-        IFlowOperator flowOperator;
-        // 拒绝时，默认返回上一个节点
-        FlowRecord preRecord = flowRecordRepository.getFlowRecordById(parentRecordId);
-        // 去除所有的转办的记录
-        while (preRecord.isTransfer()) {
-            // 继续寻找上一个节点
-            preRecord = flowRecordRepository.getFlowRecordById(preRecord.getPreId());
-        }
-        // 获取上一个节点的审批者，继续将审批者设置为当前审批者
-        flowOperator = preRecord.getCurrentOperator();
-        FlowNode nextNode = flowWork.getNodeByCode(preRecord.getNodeCode());
-        if (nextNode == null) {
-            throw new IllegalArgumentException("next node not found");
-        }
-        return this.createRecord(nextNode, flowOperator);
+    public boolean nextNodeIsOver(){
+        return nextNode.isOverNode();
     }
-
-
 }

…boot/flow/service/FlowRecordService.java …low/service/FlowRecordVerifyService.javaspringboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordService.java renamed to springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordVerifyService.java springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordService.java renamed to springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordVerifyService.java

@@ -13,7 +13,7 @@
 /**
  * 流程记录服务（流程内部服务）
  */
-class FlowRecordService {
+class FlowRecordVerifyService {
 
     // constructor params
     private final long recordId;
@@ -32,10 +32,10 @@ class FlowRecordService {
     @Getter
     private FlowRecord flowRecord;
 
-    public FlowRecordService(FlowRecordRepository flowRecordRepository,
-                             FlowProcessRepository flowProcessRepository,
-                             long recordId,
-                             IFlowOperator currentOperator) {
+    public FlowRecordVerifyService(FlowRecordRepository flowRecordRepository,
+                                   FlowProcessRepository flowProcessRepository,
+                                   long recordId,
+                                   IFlowOperator currentOperator) {
         this.flowRecordRepository = flowRecordRepository;
         this.flowProcessRepository = flowProcessRepository;