Skip to content

Commit 895da15

Browse files
committed
update FlowSession.java
1 parent 545b59d commit 895da15

26 files changed

Lines changed: 317 additions & 272 deletions

flow-engine-framework/src/main/java/com/codingapi/flow/script/node/ConditionScript.java

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

33
import com.codingapi.flow.script.ScriptDefaultConstants;
4-
import com.codingapi.flow.script.request.ConditionGroovyRequest;
4+
import com.codingapi.flow.script.request.GroovyScriptRequest;
55
import com.codingapi.flow.script.runtime.ScriptRuntimeContext;
66
import com.codingapi.flow.session.FlowSession;
77
import lombok.AllArgsConstructor;
@@ -14,7 +14,7 @@ public class ConditionScript {
1414
private final String script;
1515

1616
public boolean execute(FlowSession session) {
17-
ConditionGroovyRequest request = new ConditionGroovyRequest(session);
17+
GroovyScriptRequest request = new GroovyScriptRequest(session);
1818
return ScriptRuntimeContext.getInstance().run(script, Boolean.class, request);
1919
}
2020

flow-engine-framework/src/main/java/com/codingapi/flow/script/node/ErrorTriggerScript.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.codingapi.flow.error.ErrorThrow;
44
import com.codingapi.flow.script.ScriptDefaultConstants;
5+
import com.codingapi.flow.script.request.GroovyScriptRequest;
56
import com.codingapi.flow.script.runtime.ScriptRuntimeContext;
67
import com.codingapi.flow.session.FlowSession;
78
import lombok.AllArgsConstructor;
@@ -17,7 +18,8 @@ public class ErrorTriggerScript {
1718
@Getter
1819
private final String script;
1920

20-
public ErrorThrow execute(FlowSession request) {
21+
public ErrorThrow execute(FlowSession session) {
22+
GroovyScriptRequest request = new GroovyScriptRequest(session);
2123
return ScriptRuntimeContext.getInstance().run(script, ErrorThrow.class, request);
2224
}
2325

flow-engine-framework/src/main/java/com/codingapi/flow/script/node/NodeTitleScript.java

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

33
import com.codingapi.flow.script.ScriptDefaultConstants;
4+
import com.codingapi.flow.script.request.GroovyScriptRequest;
45
import com.codingapi.flow.script.runtime.ScriptRuntimeContext;
5-
import com.codingapi.flow.script.request.TitleGroovyRequest;
66
import com.codingapi.flow.session.FlowSession;
77
import lombok.AllArgsConstructor;
88
import lombok.Getter;
@@ -17,7 +17,7 @@ public class NodeTitleScript {
1717
private final String script;
1818

1919
public String execute(FlowSession session) {
20-
TitleGroovyRequest request = new TitleGroovyRequest(session);
20+
GroovyScriptRequest request = new GroovyScriptRequest(session);
2121
return ScriptRuntimeContext.getInstance().run(script, String.class, request);
2222
}
2323

flow-engine-framework/src/main/java/com/codingapi/flow/script/node/OperatorLoadScript.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.codingapi.flow.operator.IFlowOperator;
44
import com.codingapi.flow.script.ScriptDefaultConstants;
5-
import com.codingapi.flow.script.request.OperatorLoadGroovyRequest;
5+
import com.codingapi.flow.script.request.GroovyScriptRequest;
66
import com.codingapi.flow.script.runtime.ScriptRuntimeContext;
77
import com.codingapi.flow.session.FlowSession;
88
import lombok.AllArgsConstructor;
@@ -22,7 +22,7 @@ public class OperatorLoadScript {
2222

2323
@SuppressWarnings("unchecked")
2424
public List<IFlowOperator> execute(FlowSession session) {
25-
OperatorLoadGroovyRequest request = new OperatorLoadGroovyRequest(session);
25+
GroovyScriptRequest request = new GroovyScriptRequest(session);
2626
return ScriptRuntimeContext.getInstance().run(script, List.class, request);
2727
}
2828

flow-engine-framework/src/main/java/com/codingapi/flow/script/node/RouterNodeScript.java

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

33
import com.codingapi.flow.script.ScriptDefaultConstants;
4+
import com.codingapi.flow.script.request.GroovyScriptRequest;
45
import com.codingapi.flow.script.runtime.ScriptRuntimeContext;
56
import com.codingapi.flow.session.FlowSession;
67
import lombok.AllArgsConstructor;
@@ -15,7 +16,8 @@ public class RouterNodeScript {
1516
@Getter
1617
private final String script;
1718

18-
public String execute(FlowSession request) {
19+
public String execute(FlowSession session) {
20+
GroovyScriptRequest request = new GroovyScriptRequest(session);
1921
return ScriptRuntimeContext.getInstance().run(script, String.class, request);
2022
}
2123

flow-engine-framework/src/main/java/com/codingapi/flow/script/node/SubProcessScript.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.codingapi.flow.pojo.request.FlowCreateRequest;
44
import com.codingapi.flow.record.FlowRecord;
55
import com.codingapi.flow.script.ScriptDefaultConstants;
6+
import com.codingapi.flow.script.request.GroovyScriptRequest;
67
import com.codingapi.flow.script.runtime.ScriptRuntimeContext;
78
import com.codingapi.flow.session.FlowSession;
89
import lombok.AllArgsConstructor;
@@ -18,8 +19,9 @@ public class SubProcessScript {
1819
@Getter
1920
private final String script;
2021

21-
public FlowCreateRequest execute(FlowSession request) {
22-
FlowRecord flowRecord = request.getCurrentRecord();
22+
public FlowCreateRequest execute(FlowSession session) {
23+
FlowRecord flowRecord = session.getCurrentRecord();
24+
GroovyScriptRequest request = new GroovyScriptRequest(session);
2325
FlowCreateRequest flowCreateRequest = ScriptRuntimeContext.getInstance().run(script, FlowCreateRequest.class, request);
2426
flowCreateRequest.setParentRecordId(flowRecord.getId());
2527
return flowCreateRequest;

flow-engine-framework/src/main/java/com/codingapi/flow/script/node/TriggerScript.java

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

33
import com.codingapi.flow.script.ScriptDefaultConstants;
4+
import com.codingapi.flow.script.request.GroovyScriptRequest;
45
import com.codingapi.flow.script.runtime.ScriptRuntimeContext;
56
import com.codingapi.flow.session.FlowSession;
67
import lombok.AllArgsConstructor;
@@ -15,7 +16,8 @@ public class TriggerScript {
1516
@Getter
1617
private final String script;
1718

18-
public void execute(FlowSession request) {
19+
public void execute(FlowSession session) {
20+
GroovyScriptRequest request = new GroovyScriptRequest(session);
1921
ScriptRuntimeContext.getInstance().run(script, Void.class, request);
2022
}
2123

flow-engine-framework/src/main/java/com/codingapi/flow/script/request/BaseGroovyRequest.java

Lines changed: 0 additions & 95 deletions
This file was deleted.

flow-engine-framework/src/main/java/com/codingapi/flow/script/request/ConditionGroovyRequest.java

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
package com.codingapi.flow.script.request;
2+
3+
import com.codingapi.flow.error.ErrorThrow;
4+
import com.codingapi.flow.node.IFlowNode;
5+
import com.codingapi.flow.operator.IFlowOperator;
6+
import com.codingapi.flow.record.FlowRecord;
7+
import com.codingapi.flow.script.runtime.FlowScriptContext;
8+
import lombok.AllArgsConstructor;
9+
10+
import java.util.List;
11+
12+
/**
13+
* 流程groovy脚本绑定对象 $bind
14+
* def run(request){
15+
* $bind.createErrorThrow(operator);
16+
* }
17+
*/
18+
@AllArgsConstructor
19+
public class GroovyScriptBind {
20+
21+
private final FlowScriptContext context;
22+
23+
public ErrorThrow createErrorThrow(IFlowOperator operator) {
24+
return context.createErrorThrow(operator);
25+
}
26+
27+
public ErrorThrow createErrorThrow(IFlowNode node) {
28+
return context.createErrorThrow(node);
29+
}
30+
31+
public ErrorThrow createErrorThrow(IFlowOperator... operators) {
32+
return context.createErrorThrow(operators);
33+
}
34+
35+
public ErrorThrow createErrorThrow(List<Long> userIds) {
36+
return context.createErrorThrow(userIds);
37+
}
38+
39+
public ErrorThrow createErrorThrow(long... userIds) {
40+
return context.createErrorThrow(userIds);
41+
}
42+
43+
public <T> T getBean(Class<T> clazz) {
44+
return context.getBean(clazz);
45+
}
46+
47+
public <T> T getBean(String name, Class<T> clazz) {
48+
return context.getBean(name, clazz);
49+
}
50+
51+
public <T> List<T> getBeans(Class<T> clazz) {
52+
return context.getBeans(clazz);
53+
}
54+
55+
public FlowRecord getRecordById(long id) {
56+
return context.getRecordById(id);
57+
}
58+
59+
public IFlowOperator getOperatorById(long userId) {
60+
return context.getOperatorById(userId);
61+
}
62+
63+
public List<IFlowOperator> findOperatorsByIds(List<Long> ids) {
64+
return context.findOperatorsByIds(ids);
65+
}
66+
}

0 commit comments

Comments
 (0)