Skip to content

Commit 70f9fa6

Browse files
committed
add #82
1 parent 449f1cd commit 70f9fa6

32 files changed

Lines changed: 367 additions & 68 deletions

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.codingapi.flow.exception.FlowExecutionException;
1010
import com.codingapi.flow.manager.NodeStrategyManager;
1111
import com.codingapi.flow.manager.OperatorManager;
12+
import com.codingapi.flow.mock.MockRepositoryHolder;
1213
import com.codingapi.flow.node.IFlowNode;
1314
import com.codingapi.flow.operator.IFlowOperator;
1415
import com.codingapi.flow.record.FlowRecord;
@@ -107,7 +108,7 @@ public void run(FlowSession flowSession) {
107108

108109
for (FlowRecord record : flowRecords) {
109110
if (record.isShow()) {
110-
flowEvents.add(new FlowRecordTodoEvent(record));
111+
flowEvents.add(new FlowRecordTodoEvent(record,repositoryHolder instanceof MockRepositoryHolder));
111112
}
112113
}
113114

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.codingapi.flow.event.IFlowEvent;
1010
import com.codingapi.flow.exception.FlowExecutionException;
1111
import com.codingapi.flow.manager.OperatorManager;
12+
import com.codingapi.flow.mock.MockRepositoryHolder;
1213
import com.codingapi.flow.operator.IFlowOperator;
1314
import com.codingapi.flow.record.FlowRecord;
1415
import com.codingapi.flow.script.node.OperatorLoadScript;
@@ -59,7 +60,7 @@ public void run(FlowSession flowSession) {
5960
currentRecord.update(flowSession, true);
6061

6162
recordList.add(currentRecord);
62-
flowEvents.add(new FlowRecordDoneEvent(currentRecord));
63+
flowEvents.add(new FlowRecordDoneEvent(currentRecord,repositoryHolder instanceof MockRepositoryHolder));
6364

6465
List<IFlowOperator> operators = flowSession.getAdvice().getForwardOperators();
6566

@@ -76,7 +77,7 @@ public void run(FlowSession flowSession) {
7677
FlowRecord flowRecord = currentRecord.create(flowSession.updateSession(operator));
7778
flowRecord.resetDelegate(currentRecord);
7879
recordList.add(flowRecord);
79-
flowEvents.add(new FlowRecordTodoEvent(flowRecord));
80+
flowEvents.add(new FlowRecordTodoEvent(flowRecord,repositoryHolder instanceof MockRepositoryHolder));
8081
}
8182

8283
repositoryHolder.saveRecords(recordList);

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.codingapi.flow.event.FlowRecordTodoEvent;
88
import com.codingapi.flow.event.IFlowEvent;
99
import com.codingapi.flow.manager.NodeStrategyManager;
10+
import com.codingapi.flow.mock.MockRepositoryHolder;
1011
import com.codingapi.flow.node.BaseAuditNode;
1112
import com.codingapi.flow.node.IFlowNode;
1213
import com.codingapi.flow.operator.IFlowOperator;
@@ -74,7 +75,7 @@ public void run(FlowSession flowSession) {
7475
boolean isFinish = currentNode.isFinish(flowSession);
7576
currentRecord.update(flowSession, true);
7677
// 添加流程结束事件
77-
flowEvents.add(new FlowRecordDoneEvent(currentRecord));
78+
flowEvents.add(new FlowRecordDoneEvent(currentRecord,repositoryHolder instanceof MockRepositoryHolder));
7879
recordList.add(currentRecord);
7980

8081
// 激活下一个按顺序审批的记录数据
@@ -85,7 +86,7 @@ public void run(FlowSession flowSession) {
8586
if (record.getNodeOrder() == currentRecord.getNodeOrder() + 1) {
8687
record.show();
8788
recordList.add(record);
88-
flowEvents.add(new FlowRecordTodoEvent(record));
89+
flowEvents.add(new FlowRecordTodoEvent(record,repositoryHolder instanceof MockRepositoryHolder));
8990
}
9091
}
9192
}
@@ -98,7 +99,7 @@ public void run(FlowSession flowSession) {
9899
notifyRecord.notifyRecord(flowSession.updateSession(forwardOperator));
99100
// 如果不存储这个记录,若下一流程是结束流程时,无法更新流程状态为结束状态。
100101
repositoryHolder.saveRecord(notifyRecord);
101-
flowEvents.add(new FlowRecordDoneEvent(notifyRecord));
102+
flowEvents.add(new FlowRecordDoneEvent(notifyRecord,repositoryHolder instanceof MockRepositoryHolder));
102103
}
103104

104105
// 是否委托记录
@@ -109,17 +110,17 @@ public void run(FlowSession flowSession) {
109110
rebackRecord.clearDelegate();
110111

111112
recordList.add(rebackRecord);
112-
flowEvents.add(new FlowRecordTodoEvent(rebackRecord));
113+
flowEvents.add(new FlowRecordTodoEvent(rebackRecord,repositoryHolder instanceof MockRepositoryHolder));
113114
} else {
114115
this.triggerNode(flowSession, (triggerSession) -> {
115116
List<FlowRecord> records = this.generateRecords(triggerSession);
116117
if (!records.isEmpty()) {
117118
for (FlowRecord record : records) {
118119
if (record.isShow()) {
119120
if (record.isNotify()) {
120-
flowEvents.add(new FlowRecordDoneEvent(record));
121+
flowEvents.add(new FlowRecordDoneEvent(record,repositoryHolder instanceof MockRepositoryHolder));
121122
} else {
122-
flowEvents.add(new FlowRecordTodoEvent(record));
123+
flowEvents.add(new FlowRecordTodoEvent(record,repositoryHolder instanceof MockRepositoryHolder));
123124
}
124125
}
125126
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.codingapi.flow.event.FlowRecordTodoEvent;
88
import com.codingapi.flow.event.IFlowEvent;
99
import com.codingapi.flow.exception.FlowStateException;
10+
import com.codingapi.flow.mock.MockRepositoryHolder;
1011
import com.codingapi.flow.node.IFlowNode;
1112
import com.codingapi.flow.record.FlowRecord;
1213
import com.codingapi.flow.script.action.RejectActionScript;
@@ -97,7 +98,7 @@ public void run(FlowSession flowSession) {
9798
recordList.addAll(records);
9899
for (FlowRecord record : records) {
99100
if (record.isShow()) {
100-
flowEvents.add(new FlowRecordTodoEvent(record));
101+
flowEvents.add(new FlowRecordTodoEvent(record,repositoryHolder instanceof MockRepositoryHolder));
101102
}
102103
}
103104
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.codingapi.flow.event.FlowRecordDoneEvent;
77
import com.codingapi.flow.event.FlowRecordTodoEvent;
88
import com.codingapi.flow.event.IFlowEvent;
9+
import com.codingapi.flow.mock.MockRepositoryHolder;
910
import com.codingapi.flow.node.IFlowNode;
1011
import com.codingapi.flow.record.FlowRecord;
1112
import com.codingapi.flow.session.FlowSession;
@@ -47,14 +48,14 @@ public void run(FlowSession flowSession) {
4748
currentRecord.update(flowSession, true);
4849
recordList.add(currentRecord);
4950

50-
flowEvents.add(new FlowRecordDoneEvent(currentRecord));
51+
flowEvents.add(new FlowRecordDoneEvent(currentRecord,repositoryHolder instanceof MockRepositoryHolder));
5152

5253
List<FlowRecord> flowRecords = backNode.generateCurrentRecords(flowSession.updateSession(backNode));
5354
recordList.addAll(flowRecords);
5455

5556
for (FlowRecord record : flowRecords) {
5657
if (record.isShow()) {
57-
flowEvents.add(new FlowRecordTodoEvent(record));
58+
flowEvents.add(new FlowRecordTodoEvent(record,repositoryHolder instanceof MockRepositoryHolder));
5859
}
5960
}
6061

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.codingapi.flow.event.IFlowEvent;
1010
import com.codingapi.flow.exception.FlowExecutionException;
1111
import com.codingapi.flow.manager.OperatorManager;
12+
import com.codingapi.flow.mock.MockRepositoryHolder;
1213
import com.codingapi.flow.operator.IFlowOperator;
1314
import com.codingapi.flow.record.FlowRecord;
1415
import com.codingapi.flow.script.node.OperatorLoadScript;
@@ -66,7 +67,7 @@ public void run(FlowSession flowSession) {
6667

6768
currentRecord.update(flowSession, true);
6869
recordList.add(currentRecord);
69-
flowEvents.add(new FlowRecordDoneEvent(currentRecord));
70+
flowEvents.add(new FlowRecordDoneEvent(currentRecord,repositoryHolder instanceof MockRepositoryHolder));
7071

7172
List<IFlowOperator> operators = flowSession.getAdvice().getForwardOperators();
7273
if (script != null) {
@@ -81,7 +82,7 @@ public void run(FlowSession flowSession) {
8182
for (IFlowOperator operator : operators) {
8283
FlowRecord flowRecord = currentRecord.create(flowSession.updateSession(operator));
8384
recordList.add(flowRecord);
84-
flowEvents.add(new FlowRecordTodoEvent(flowRecord));
85+
flowEvents.add(new FlowRecordTodoEvent(flowRecord,repositoryHolder instanceof MockRepositoryHolder));
8586
}
8687

8788
repositoryHolder.saveRecords(recordList);

flow-engine-framework/src/main/java/com/codingapi/flow/event/FlowRecordDoneEvent.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@ public class FlowRecordDoneEvent implements IFlowEvent {
1313

1414
private final FlowRecord flowRecord;
1515

16+
private final boolean mock;
17+
18+
19+
1620
}

flow-engine-framework/src/main/java/com/codingapi/flow/event/FlowRecordFinishEvent.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ public class FlowRecordFinishEvent implements IFlowEvent {
1313

1414
private final FlowRecord flowRecord;
1515

16+
private final boolean mock;
1617
}

flow-engine-framework/src/main/java/com/codingapi/flow/event/FlowRecordStartEvent.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ public class FlowRecordStartEvent implements IFlowEvent {
1313

1414
private final FlowRecord flowRecord;
1515

16+
private final boolean mock;
1617
}

flow-engine-framework/src/main/java/com/codingapi/flow/event/FlowRecordTodoEvent.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ public class FlowRecordTodoEvent implements IFlowEvent {
1313

1414
private final FlowRecord flowRecord;
1515

16+
private final boolean mock;
1617
}

0 commit comments

Comments
 (0)