11package com .codingapi .flow .service .impl ;
22
33import com .codingapi .flow .action .BaseAction ;
4- import com .codingapi .flow .action .IFlowAction ;
5- import com .codingapi .flow .action .actions .PassAction ;
6- import com .codingapi .flow .cache .FlowRuntimeScriptLocalCache ;
74import com .codingapi .flow .domain .SubProcessContext ;
85import com .codingapi .flow .domain .SubProcessRecord ;
96import com .codingapi .flow .error .ErrorThrow ;
107import com .codingapi .flow .event .FlowRecordDoneEvent ;
118import com .codingapi .flow .event .FlowRecordTodoEvent ;
129import com .codingapi .flow .event .IFlowEvent ;
13- import com .codingapi .flow .exception .FlowNotFoundException ;
1410import com .codingapi .flow .exception .FlowValidationException ;
15- import com .codingapi .flow .form .FormData ;
1611import com .codingapi .flow .node .BaseFlowNode ;
1712import com .codingapi .flow .node .IFlowNode ;
1813import com .codingapi .flow .node .nodes .SubProcessNode ;
19- import com .codingapi .flow .operator .IFlowOperator ;
2014import com .codingapi .flow .record .FlowRecord ;
2115import com .codingapi .flow .repository .SubProcessRepository ;
22- import com .codingapi .flow .service .WorkflowService ;
23- import com .codingapi .flow .session .FlowAdvice ;
2416import com .codingapi .flow .session .FlowSession ;
2517import com .codingapi .flow .session .IRepositoryHolder ;
2618import com .codingapi .flow .strategy .node .SubProcessStrategy ;
27- import com .codingapi .flow .workflow .Workflow ;
28- import com .codingapi .flow .workflow .runtime .WorkflowRuntime ;
2919import com .codingapi .springboot .framework .event .EventPusher ;
3020
3121import java .util .ArrayList ;
@@ -39,13 +29,11 @@ public class FlowSubProcessResultService {
3929 private final FlowRecord childFinalRecord ;
4030 private final IRepositoryHolder repositoryHolder ;
4131 private final SubProcessRepository subProcessRepository ;
42- private final WorkflowService workflowService ;
4332
4433 public FlowSubProcessResultService (FlowRecord childFinalRecord , IRepositoryHolder repositoryHolder ) {
4534 this .childFinalRecord = childFinalRecord ;
4635 this .repositoryHolder = repositoryHolder ;
4736 this .subProcessRepository = repositoryHolder .getSubProcessRepository ();
48- this .workflowService = repositoryHolder .getWorkflowService ();
4937 }
5038
5139 public void complete () {
@@ -90,42 +78,8 @@ public void complete() {
9078 }
9179
9280 private FlowSession createParentSession (SubProcessRecord subProcessRecord ) {
93- FlowRecord parentRecord = repositoryHolder .getRecordById (subProcessRecord .getParentRecordId ());
94- if (parentRecord == null ) {
95- throw FlowNotFoundException .record (subProcessRecord .getParentRecordId ());
96- }
97- WorkflowRuntime workflowRuntime = workflowService .getWorkflowRuntime (subProcessRecord .getParentWorkRuntimeId ());
98- if (workflowRuntime == null ) {
99- throw FlowNotFoundException .workflow (subProcessRecord .getParentWorkRuntimeId () + " not found" );
100- }
101- FlowRuntimeScriptLocalCache .getInstance ().set (workflowRuntime .getScripts ());
102- Workflow workflow = workflowRuntime .toWorkflow ();
103- IFlowNode sourceNode = workflow .getFlowNode (parentRecord .getNodeId ());
104- IFlowAction action = sourceNode .actionManager ().getActionById (parentRecord .getActionId ());
105- // 前驱记录可能为相同人员自动通过的留痕记录(无审批动作,actionId=null,issue #226):
106- // 恢复下游以来源节点的通过动作兜底,避免空动作会话导致 NPE 使主流程永久停滞
107- if (action == null && parentRecord .isAutoDone ()) {
108- action = sourceNode .actionManager ().getAction (PassAction .class );
109- }
110- IFlowOperator currentOperator = repositoryHolder .getOperatorById (parentRecord .getCurrentOperatorId ());
111- IFlowOperator createdOperator = repositoryHolder .getOperatorById (parentRecord .getCreateOperatorId ());
112- IFlowOperator submitOperator = repositoryHolder .getOperatorById (parentRecord .getSubmitOperatorId ());
113- FormData formData = new FormData (workflow .getForm ());
114- formData .reset (parentRecord .getFormData ());
115- FlowAdvice advice = parentRecord .toAdvice (workflow );
116- IFlowNode subProcessNode = workflow .getFlowNode (subProcessRecord .getNodeId ());
117- FlowSession session = new FlowSession (repositoryHolder ,
118- currentOperator ,
119- createdOperator ,
120- submitOperator ,
121- workflow ,
122- subProcessNode ,
123- action ,
124- formData ,
125- parentRecord ,
126- List .of (),
127- parentRecord .getWorkRuntimeId (),
128- advice );
81+ FlowSession session = SubProcessSessionFactory .createParentSession (
82+ subProcessRecord , repositoryHolder , repositoryHolder .getWorkflowService ());
12983 session .setSubProcessContext (new SubProcessContext (subProcessRecord , childFinalRecord ));
13084 return session ;
13185 }
0 commit comments