Skip to content

Commit 8f6b894

Browse files
authored
Merge pull request #236 from codingapi/dev
Dev
2 parents dbcaad3 + e8daed3 commit 8f6b894

14 files changed

Lines changed: 851 additions & 17 deletions

File tree

Lines changed: 222 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,222 @@
1+
package com.codingapi.example;
2+
3+
import com.codingapi.example.entity.User;
4+
import com.codingapi.example.repository.UserRepository;
5+
import com.codingapi.flow.action.IFlowAction;
6+
import com.codingapi.flow.action.actions.CustomAction;
7+
import com.codingapi.flow.action.actions.PassAction;
8+
import com.codingapi.flow.action.actions.RejectAction;
9+
import com.codingapi.flow.builder.ActionBuilder;
10+
import com.codingapi.flow.builder.FormFieldPermissionsBuilder;
11+
import com.codingapi.flow.builder.NodeStrategyBuilder;
12+
import com.codingapi.flow.form.DataType;
13+
import com.codingapi.flow.form.FlowForm;
14+
import com.codingapi.flow.form.FlowFormBuilder;
15+
import com.codingapi.flow.form.permission.PermissionType;
16+
import com.codingapi.flow.node.nodes.ApprovalNode;
17+
import com.codingapi.flow.node.nodes.EndNode;
18+
import com.codingapi.flow.node.nodes.StartNode;
19+
import com.codingapi.flow.pojo.body.FlowAdviceBody;
20+
import com.codingapi.flow.pojo.request.FlowActionRequest;
21+
import com.codingapi.flow.pojo.request.FlowCreateRequest;
22+
import com.codingapi.flow.pojo.request.FlowDetailRequest;
23+
import com.codingapi.flow.pojo.request.FlowProcessNodeRequest;
24+
import com.codingapi.flow.record.FlowRecord;
25+
import com.codingapi.flow.repository.FlowRecordRepository;
26+
import com.codingapi.flow.script.factory.FlowGroovyScriptFactory;
27+
import com.codingapi.flow.service.FlowService;
28+
import com.codingapi.flow.service.WorkflowService;
29+
import com.codingapi.flow.strategy.node.FormFieldPermissionStrategy;
30+
import com.codingapi.flow.strategy.node.MultiOperatorAuditStrategy;
31+
import com.codingapi.flow.strategy.node.OperatorLoadStrategy;
32+
import com.codingapi.flow.workflow.Workflow;
33+
import com.codingapi.flow.workflow.WorkflowBuilder;
34+
import org.junit.jupiter.api.Test;
35+
import org.springframework.beans.factory.annotation.Autowired;
36+
import org.springframework.boot.test.context.SpringBootTest;
37+
import org.springframework.test.context.TestPropertySource;
38+
39+
import java.util.List;
40+
import java.util.Map;
41+
42+
import static org.junit.jupiter.api.Assertions.assertEquals;
43+
import static org.junit.jupiter.api.Assertions.assertNotNull;
44+
import static org.junit.jupiter.api.Assertions.assertTrue;
45+
46+
/**
47+
* issue #235 补充场景(生产路径):C 节点任意审批,拒绝配置为终止流程。
48+
*
49+
* <p>验证 c1 拒绝终止后,c2 的同节点待办自动办结,流程终止,且流程视图/详情查询正常。
50+
*/
51+
@SpringBootTest
52+
@TestPropertySource(properties = "spring.datasource.url=jdbc:h2:mem:flow-issue235-terminate-test;DB_CLOSE_DELAY=-1")
53+
class FlowIssue235AnyRejectTerminateTest {
54+
55+
@Autowired
56+
private FlowService flowService;
57+
58+
@Autowired
59+
private WorkflowService workflowService;
60+
61+
@Autowired
62+
private UserRepository userRepository;
63+
64+
@Autowired
65+
private FlowRecordRepository flowRecordRepository;
66+
67+
private User createUser(String account) {
68+
User user = new User();
69+
user.setName(account);
70+
user.setAccount(account);
71+
user.setPassword("pwd-" + System.nanoTime());
72+
user.setFlowManager(false);
73+
return userRepository.save(user);
74+
}
75+
76+
private FlowRecord todoOf(String processId, long operatorId) {
77+
List<FlowRecord> todos = flowRecordRepository.findTodoRecords(processId).stream()
78+
.filter(record -> record.getCurrentOperatorId() == operatorId)
79+
.toList();
80+
assertEquals(1, todos.size(), "审批人[" + operatorId + "]应有一条待办");
81+
return todos.get(0);
82+
}
83+
84+
@Test
85+
void anyRejectTerminateShouldAutoDoneSiblingAndTerminateFlow() {
86+
String code = "issue235-terminate-" + System.nanoTime();
87+
88+
User creator = createUser("issue235-creator-" + System.nanoTime());
89+
User b1 = createUser("issue235-b1-" + System.nanoTime());
90+
User c1 = createUser("issue235-c1-" + System.nanoTime());
91+
User c2 = createUser("issue235-c2-" + System.nanoTime());
92+
93+
FlowForm form = FlowFormBuilder.builder()
94+
.name("issue235")
95+
.code(code)
96+
.addField("name", "name", DataType.STRING)
97+
.build();
98+
FormFieldPermissionsBuilder permissions = FormFieldPermissionsBuilder.builder()
99+
.addPermission(code, "name", PermissionType.WRITE);
100+
101+
StartNode startNode = StartNode.builder()
102+
.strategies(NodeStrategyBuilder.builder()
103+
.addStrategy(new FormFieldPermissionStrategy(permissions.build()))
104+
.build())
105+
.actions(ActionBuilder.builder().addAction(CustomAction.defaultAction()).build())
106+
.build();
107+
108+
ApprovalNode bNode = ApprovalNode.builder()
109+
.name("B审批")
110+
.strategies(NodeStrategyBuilder.builder()
111+
.addStrategy(new FormFieldPermissionStrategy(permissions.build()))
112+
.addStrategy(new OperatorLoadStrategy(FlowGroovyScriptFactory
113+
.createOperatorLoadScript("def run(request){return [" + b1.getId() + "]}")
114+
.getKey()))
115+
.build())
116+
.build();
117+
118+
RejectAction rejectAction = RejectAction.defaultAction();
119+
rejectAction.setScript(FlowGroovyScriptFactory
120+
.createActionRejectScript("def run(request){return 'TERMINATE'}")
121+
.getKey());
122+
ApprovalNode cNode = ApprovalNode.builder()
123+
.name("C审批")
124+
.strategies(NodeStrategyBuilder.builder()
125+
.addStrategy(new FormFieldPermissionStrategy(permissions.build()))
126+
.addStrategy(new OperatorLoadStrategy(FlowGroovyScriptFactory
127+
.createOperatorLoadScript(
128+
"def run(request){return [" + c1.getId() + "," + c2.getId() + "]}")
129+
.getKey()))
130+
.addStrategy(new MultiOperatorAuditStrategy(MultiOperatorAuditStrategy.Type.ANY, 0))
131+
.build())
132+
.actions(ActionBuilder.builder()
133+
.addAction(PassAction.defaultAction())
134+
.addAction(rejectAction)
135+
.build())
136+
.build();
137+
138+
Workflow workflow = WorkflowBuilder.builder()
139+
.title("issue235")
140+
.code(code)
141+
.createdOperator(creator)
142+
.form(form)
143+
.addNode(startNode)
144+
.addNode(bNode)
145+
.addNode(cNode)
146+
.addNode(EndNode.builder().build())
147+
.build();
148+
workflowService.saveWorkflow(workflow);
149+
150+
Map<String, Object> data = Map.of("name", "lorne");
151+
152+
// 发起 -> B
153+
IFlowAction startAction = startNode.actionManager().getActions().get(0);
154+
FlowCreateRequest createRequest = new FlowCreateRequest();
155+
createRequest.setWorkCode(code);
156+
createRequest.setFormData(data);
157+
createRequest.setActionId(startAction.id());
158+
createRequest.setOperatorId(creator.getId());
159+
long startRecordId = flowService.create(createRequest);
160+
String processId = flowRecordRepository.get(startRecordId).getProcessId();
161+
162+
FlowActionRequest startPass = new FlowActionRequest();
163+
startPass.setFormData(data);
164+
startPass.setRecordId(startRecordId);
165+
startPass.setAdvice(new FlowAdviceBody(startAction.id(), "同意", creator.getId()));
166+
flowService.action(startPass);
167+
168+
// B 通过 -> C
169+
FlowRecord bTodo = todoOf(processId, b1.getId());
170+
pass(bTodo, workflow.getFlowNode(bTodo.getNodeId()), b1.getId(), data);
171+
172+
// C 节点 c1、c2 同时收到待办
173+
FlowRecord c1Record = todoOf(processId, c1.getId());
174+
FlowRecord c2Record = todoOf(processId, c2.getId());
175+
176+
// c1 拒绝并终止流程
177+
IFlowAction rejectActionOfNode = workflow.getFlowNode(c1Record.getNodeId())
178+
.actionManager().getActions().stream()
179+
.filter(action -> "REJECT".equals(action.type()))
180+
.findFirst().orElseThrow();
181+
FlowActionRequest rejectRequest = new FlowActionRequest();
182+
rejectRequest.setFormData(data);
183+
rejectRequest.setRecordId(c1Record.getId());
184+
rejectRequest.setAdvice(new FlowAdviceBody(rejectActionOfNode.id(), "拒绝", c1.getId()));
185+
flowService.action(rejectRequest);
186+
187+
// 终止后:c2 无待办,c2 记录已办
188+
assertEquals(0, flowRecordRepository.findTodoRecords(processId).stream()
189+
.filter(record -> record.getCurrentOperatorId() == c2.getId()).count(),
190+
"c2 不应遗留待办");
191+
192+
// 以自动办结的 c2 记录为入口查询流程视图与详情,均不应报错
193+
assertNotNull(flowService.processNodes(
194+
new FlowProcessNodeRequest(c2Record.getId(), c2.getId(), data)));
195+
assertNotNull(flowService.detail(new FlowDetailRequest(c2Record.getId(), c2.getId())));
196+
197+
List<FlowRecord> processRecords = flowRecordRepository.findProcessRecords(processId);
198+
List<FlowRecord> cRecords = processRecords.stream()
199+
.filter(record -> c1Record.getNodeId().equals(record.getNodeId()))
200+
.toList();
201+
assertEquals(2, cRecords.stream().filter(FlowRecord::isDone).count(),
202+
"C 节点两条记录都应为已办");
203+
assertTrue(processRecords.stream().allMatch(FlowRecord::isFinish),
204+
"流程终止后所有记录应进入终态");
205+
assertTrue(processRecords.stream()
206+
.filter(record -> c2.getId() == record.getCurrentOperatorId())
207+
.allMatch(FlowRecord::isFinish),
208+
"c2 自动办结的记录也应进入终态");
209+
}
210+
211+
private void pass(FlowRecord record, com.codingapi.flow.node.IFlowNode node, long operatorId,
212+
Map<String, Object> data) {
213+
IFlowAction action = node.actionManager().getActions().stream()
214+
.filter(item -> "PASS".equals(item.type()))
215+
.findFirst().orElseThrow();
216+
FlowActionRequest request = new FlowActionRequest();
217+
request.setFormData(data);
218+
request.setRecordId(record.getId());
219+
request.setAdvice(new FlowAdviceBody(action.id(), "同意", operatorId));
220+
flowService.action(request);
221+
}
222+
}

‎flow-engine-framework/src/main/java/com/codingapi/flow/action/BaseAction.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.codingapi.flow.action;
22

33
import com.codingapi.flow.common.IMapConvertor;
4+
import com.codingapi.flow.event.FlowRecordTodoEvent;
5+
import com.codingapi.flow.event.IFlowEvent;
46
import com.codingapi.flow.node.IFlowNode;
57
import com.codingapi.flow.record.FlowRecord;
68
import com.codingapi.flow.session.FlowSession;
@@ -110,6 +112,14 @@ protected static <T extends BaseAction> T fromMap(Map<String, Object> data, Clas
110112
public void run(FlowSession flowSession) {
111113
}
112114

115+
/**
116+
* 是否为结束节点虚拟记录的待办事件(非真实业务待办,推送时需要拦截)
117+
*/
118+
protected boolean isEndNodeTodoEvent(IFlowEvent event) {
119+
return event instanceof FlowRecordTodoEvent todoEvent
120+
&& !todoEvent.getFlowRecord().isNotEndNode();
121+
}
122+
113123
/**
114124
* 触发并执行后续节点
115125
*

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,6 @@ public void run(FlowSession flowSession) {
234234
.forEach(EventPusher::push);
235235
}
236236

237-
/**
238-
* 是否为结束节点虚拟记录的待办事件(非真实业务待办,推送时需要拦截)
239-
*/
240-
private boolean isEndNodeTodoEvent(IFlowEvent event) {
241-
return event instanceof FlowRecordTodoEvent todoEvent
242-
&& !todoEvent.getFlowRecord().isNotEndNode();
243-
}
244-
245237
/**
246238
* 收集需要审批人设定的下游节点。
247239
*

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,37 @@ public void run(FlowSession flowSession) {
105105
// 当前审批为已办状态
106106
flowEvents.add(new FlowRecordDoneEvent(flowRecord, flowSession.isMock()));
107107

108+
// 拒绝即结束当前节点:将同节点其他未办理的待办(或签/并签的其他审批人)自动置为已办。
109+
// 否则节点被退回后仍会遗留待办,审批人可继续办理,流程视图也会停留在当前节点(issue #235)。
110+
for (FlowRecord record : flowSession.getCurrentNodeRecords()) {
111+
if (record.getId() != flowRecord.getId() && record.isTodo()) {
112+
record.autoDone();
113+
recordList.add(record);
114+
flowEvents.add(new FlowRecordDoneEvent(record, flowSession.isMock()));
115+
}
116+
}
117+
118+
// 先保存当前记录及同节点待办的自动办结状态,再触发退回/终止节点。
119+
// 终止流程时 EndNode.fillNewRecord 会按数据库中的最新记录统一置为结束状态,
120+
// 若在触发后再统一保存,会用本会话中陈旧的“运行中”状态覆盖终态(issue #235 / #184)。
121+
repositoryHolder.saveRecords(recordList);
122+
recordList.clear();
123+
108124
List<FlowRecord> records = this.generateRecords(flowSession);
109125
if (!records.isEmpty()) {
110-
recordList.addAll(records);
111126
for (FlowRecord record : records) {
112127
if (record.isShow()) {
113128
flowEvents.add(new FlowRecordTodoEvent(record, flowSession.isMock()));
114129
}
115130
}
131+
recordList.addAll(records);
116132
}
117133
repositoryHolder.saveRecords(recordList);
118-
flowEvents.forEach(EventPusher::push);
134+
135+
// 结束节点的虚拟记录不是真实业务待办,其 Todo 事件推送业务订阅方前需拦截
136+
flowEvents.stream()
137+
.filter(event -> !isEndNodeTodoEvent(event))
138+
.forEach(EventPusher::push);
119139

120140
}
121141
}

‎flow-engine-framework/src/main/java/com/codingapi/flow/cache/FlowOperatorLocalThreadCache.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public IFlowOperator get(long id, Supplier<IFlowOperator> operatorLoader) {
4848

4949
operator = operatorLoader.get();
5050
if (operator != null) {
51-
operatorCaches.put(operator.getUserId(), operator);
51+
operatorCaches.put(id, operator);
5252
this.cache.set(operatorCaches);
5353
}
5454
return operator;

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,17 @@ public static FlowStateException subProcessResetMergeNodeOnly() {
174174
return new FlowStateException("state.subProcess.resetMergeNodeOnly",
175175
"Sub process reset only allowed on the todo record of the locked merge node");
176176
}
177+
178+
/**
179+
* Workflow script not found when executing a node or action
180+
*
181+
* @param key script key
182+
* @return exception
183+
*/
184+
public static FlowStateException scriptNotFound(String key) {
185+
return new FlowStateException("state.script.notFound",
186+
String.format("Workflow script not found: %s. "
187+
+ "Please check that the script is persisted (GroovyScriptRepository is registered) "
188+
+ "and that the workflow version referencing it is saved correctly", key));
189+
}
177190
}

‎flow-engine-framework/src/main/java/com/codingapi/flow/script/runtime/FlowScriptRuntimeContext.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.codingapi.flow.script.runtime;
22

33
import com.codingapi.flow.cache.FlowRuntimeScriptLocalCache;
4+
import com.codingapi.flow.exception.FlowStateException;
45
import com.codingapi.springboot.script.GroovyScript;
56
import com.codingapi.springboot.script.cache.GroovyScriptCacheContext;
67

@@ -34,6 +35,11 @@ public static FlowScriptRuntimeContext getInstance() {
3435
public GroovyScript getGroovyScript(String key) {
3536
GroovyScript cached = GroovyScriptCacheContext.getInstance().getGroovyScript(key);
3637
String snapshot = FlowRuntimeScriptLocalCache.getInstance().get(key);
38+
if (cached == null && snapshot == null) {
39+
// 全局缓存、临时缓存、持久化仓储与运行时快照均找不到脚本,
40+
// 直接抛出明确异常,避免调用方在 invoke 处出现难以定位的空指针
41+
throw FlowStateException.scriptNotFound(key);
42+
}
3743
if (snapshot == null) {
3844
// 非运行态:不干预,返回全局缓存中的脚本对象
3945
return cached;

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.codingapi.flow.service;
22

3+
import com.codingapi.flow.exception.FlowStateException;
34
import com.codingapi.flow.generator.FlowIDGeneratorGatewayContext;
45
import com.codingapi.flow.javscript.NodeViewJavaScript;
56
import com.codingapi.flow.javscript.NodeViewJavaScriptCacheContext;
@@ -66,12 +67,14 @@ public static void resetGroovyScripts(Object target) {
6667
GroovyScriptFieldResult result = GroovyScriptAnnotationScannerUtils.findGroovyScriptFields(target);
6768
result.update((key) -> {
6869
GroovyScript groovyScript = GroovyScriptCacheContext.getInstance().getGroovyScript(key);
69-
if (groovyScript != null) {
70-
GroovyScript latestScript = groovyScript.copy(FlowIDGeneratorGatewayContext.getInstance().generateFlowScriptKey());
71-
latestScript.save();
72-
return latestScript.getKey();
70+
if (groovyScript == null) {
71+
// 脚本内容已丢失(例如设计器临时脚本超过有效期),若继续保存会把悬空的脚本key写入流程定义,
72+
// 直到对应节点执行时才以空指针的形式暴露,因此保存阶段直接给出明确错误
73+
throw FlowStateException.scriptNotFound(key);
7374
}
74-
return key;
75+
GroovyScript latestScript = groovyScript.copy(FlowIDGeneratorGatewayContext.getInstance().generateFlowScriptKey());
76+
latestScript.save();
77+
return latestScript.getKey();
7578
});
7679
}
7780
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.codingapi.flow.repository.WorkflowRepository;
77
import com.codingapi.flow.repository.WorkflowRuntimeRepository;
88
import com.codingapi.flow.repository.WorkflowVersionRepository;
9+
import com.codingapi.flow.transfer.WorkflowGroovyScriptTransferService;
910
import com.codingapi.flow.transfer.WorkflowImportMode;
1011
import com.codingapi.flow.transfer.WorkflowTransferService;
1112
import com.codingapi.flow.utils.Base64Utils;
@@ -44,6 +45,9 @@ public void saveWorkflowVersion(WorkflowVersion currentVersion, boolean creatabl
4445

4546
currentVersion.enableVersion();
4647
if (currentVersion.getId() == 0) {
48+
// 兼容历史设计数据:旧版设计器可能把脚本正文直接写入脚本字段,
49+
// 保存前先归一化为脚本key,避免悬空的脚本内容在运行时才以空指针暴露(issue #235)
50+
new WorkflowGroovyScriptTransferService().normalizeInlineScripts(currentVersion);
4751
// 新创建的版本,替换脚本
4852
WorkflowGroovyScriptUtils.resetScripts(currentVersion);
4953
}

0 commit comments

Comments
 (0)