Skip to content

Commit 07c858d

Browse files
xlornexlorne
committed
change WorkflowBackup.java name WorkflowRuntime.java
1 parent 188e156 commit 07c858d

29 files changed

Lines changed: 217 additions & 217 deletions

‎flow-engine-framework/src/main/java/com/codingapi/flow/context/RepositoryHolderContext.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ private RepositoryHolderContext() {
2929
@Getter
3030
private WorkflowRepository workflowRepository;
3131
@Getter
32-
private WorkflowBackupRepository workflowBackupRepository;
32+
private WorkflowRuntimeRepository workflowRuntimeRepository;
3333
@Getter
3434
private FlowRecordRepository flowRecordRepository;
3535
@Getter
@@ -51,7 +51,7 @@ private RepositoryHolderContext() {
5151
public boolean isRegistered() {
5252
return parallelBranchRepository != null
5353
&& delayTaskRepository != null
54-
&& workflowBackupRepository != null
54+
&& workflowRuntimeRepository != null
5555
&& flowRecordRepository != null
5656
&& flowTodoRecordRepository != null
5757
&& flowTodoMergeRepository != null
@@ -68,7 +68,7 @@ public void verify() {
6868
}
6969

7070
public void register(WorkflowRepository workflowRepository,
71-
WorkflowBackupRepository workflowBackupRepository,
71+
WorkflowRuntimeRepository workflowRuntimeRepository,
7272
FlowRecordRepository flowRecordRepository,
7373
FlowTodoRecordRepository flowTodoRecordRepository,
7474
FlowTodoMergeRepository flowTodoMergeRepository,
@@ -77,7 +77,7 @@ public void register(WorkflowRepository workflowRepository,
7777
DelayTaskRepository delayTaskRepository,
7878
UrgeIntervalRepository urgeIntervalRepository) {
7979
this.workflowRepository = workflowRepository;
80-
this.workflowBackupRepository = workflowBackupRepository;
80+
this.workflowRuntimeRepository = workflowRuntimeRepository;
8181
this.flowRecordRepository = flowRecordRepository;
8282
this.flowTodoRecordRepository = flowTodoRecordRepository;
8383
this.flowTodoMergeRepository = flowTodoMergeRepository;
@@ -99,7 +99,7 @@ public FlowDelayTriggerService createDelayTriggerService(DelayTask task) {
9999
return new FlowDelayTriggerService(task,
100100
flowOperatorGateway,
101101
flowRecordRepository,
102-
workflowBackupRepository);
102+
workflowRuntimeRepository);
103103
}
104104

105105

@@ -127,7 +127,7 @@ public FlowService createFlowService() {
127127
flowRecordRepository,
128128
flowTodoRecordRepository,
129129
flowTodoMergeRepository,
130-
workflowBackupRepository,
130+
workflowRuntimeRepository,
131131
parallelBranchRepository,
132132
delayTaskRepository,
133133
urgeIntervalRepository);

‎flow-engine-framework/src/main/java/com/codingapi/flow/repository/WorkflowBackupRepository.java‎

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

‎flow-engine-framework/src/main/java/com/codingapi/flow/repository/WorkflowRuntimeRepository.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.codingapi.flow.repository;
2+
3+
import com.codingapi.flow.workflow.runtime.WorkflowRuntime;
4+
5+
/**
6+
* 运行时流程仓库
7+
*/
8+
public interface WorkflowRuntimeRepository {
9+
10+
void save(WorkflowRuntime workflowRuntime);
11+
12+
WorkflowRuntime get(long id);
13+
14+
WorkflowRuntime getByWorkId(String workId, long workVersion);
15+
16+
void delete(WorkflowRuntime backup);
17+
18+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ public FlowService(WorkflowRepository workflowRepository,
2222
FlowRecordRepository flowRecordRepository,
2323
FlowTodoRecordRepository flowTodoRecordRepository,
2424
FlowTodoMergeRepository flowTodoMergeRepository,
25-
WorkflowBackupRepository workflowBackupRepository,
25+
WorkflowRuntimeRepository workflowRuntimeRepository,
2626
ParallelBranchRepository parallelBranchRepository,
2727
DelayTaskRepository delayTaskRepository,
2828
UrgeIntervalRepository urgeIntervalRepository) {
2929
RepositoryHolderContext.getInstance()
3030
.register(workflowRepository,
31-
workflowBackupRepository,
31+
workflowRuntimeRepository,
3232
flowRecordRepository,
3333
flowTodoRecordRepository,
3434
flowTodoMergeRepository,

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

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

33
import com.codingapi.flow.action.IFlowAction;
4-
import com.codingapi.flow.backup.WorkflowBackup;
4+
import com.codingapi.flow.workflow.runtime.WorkflowRuntime;
55
import com.codingapi.flow.context.RepositoryHolderContext;
66
import com.codingapi.flow.exception.FlowNotFoundException;
77
import com.codingapi.flow.exception.FlowStateException;
@@ -13,7 +13,7 @@
1313
import com.codingapi.flow.pojo.request.FlowActionRequest;
1414
import com.codingapi.flow.record.FlowRecord;
1515
import com.codingapi.flow.repository.FlowRecordRepository;
16-
import com.codingapi.flow.repository.WorkflowBackupRepository;
16+
import com.codingapi.flow.repository.WorkflowRuntimeRepository;
1717
import com.codingapi.flow.session.FlowAdvice;
1818
import com.codingapi.flow.session.FlowSession;
1919
import com.codingapi.flow.workflow.Workflow;
@@ -26,13 +26,13 @@ public class FlowActionService {
2626
private final FlowActionRequest request;
2727
private final FlowOperatorGateway flowOperatorGateway;
2828
private final FlowRecordRepository flowRecordRepository;
29-
private final WorkflowBackupRepository workflowBackupRepository;
29+
private final WorkflowRuntimeRepository workflowRuntimeRepository;
3030

3131
public FlowActionService(FlowActionRequest request) {
3232
this.request = request;
3333
this.flowOperatorGateway = RepositoryHolderContext.getInstance().getFlowOperatorGateway();
3434
this.flowRecordRepository = RepositoryHolderContext.getInstance().getFlowRecordRepository();
35-
this.workflowBackupRepository = RepositoryHolderContext.getInstance().getWorkflowBackupRepository();
35+
this.workflowRuntimeRepository = RepositoryHolderContext.getInstance().getWorkflowRuntimeRepository();
3636
}
3737

3838
public void action() {
@@ -51,12 +51,12 @@ public void action() {
5151
throw FlowStateException.recordAlreadyDone();
5252
}
5353

54-
WorkflowBackup workflowBackup = workflowBackupRepository.get(flowRecord.getWorkBackupId());
55-
if (workflowBackup == null) {
54+
WorkflowRuntime workflowRuntime = workflowRuntimeRepository.get(flowRecord.getWorkBackupId());
55+
if (workflowRuntime == null) {
5656
throw FlowNotFoundException.workflow(flowRecord.getWorkBackupId() + " not found");
5757
}
5858

59-
Workflow workflow = workflowBackup.toWorkflow();
59+
Workflow workflow = workflowRuntime.toWorkflow();
6060

6161
long recordOperatorId = flowRecord.getCurrentOperatorId();
6262
WorkflowStrategyManager workflowStrategyManager = workflow.strategyManager();

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

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

33
import com.codingapi.flow.action.IFlowAction;
4-
import com.codingapi.flow.backup.WorkflowBackup;
4+
import com.codingapi.flow.workflow.runtime.WorkflowRuntime;
55
import com.codingapi.flow.context.RepositoryHolderContext;
66
import com.codingapi.flow.event.FlowRecordStartEvent;
77
import com.codingapi.flow.event.FlowRecordTodoEvent;
@@ -16,7 +16,7 @@
1616
import com.codingapi.flow.operator.IFlowOperator;
1717
import com.codingapi.flow.pojo.request.FlowCreateRequest;
1818
import com.codingapi.flow.record.FlowRecord;
19-
import com.codingapi.flow.repository.WorkflowBackupRepository;
19+
import com.codingapi.flow.repository.WorkflowRuntimeRepository;
2020
import com.codingapi.flow.repository.WorkflowRepository;
2121
import com.codingapi.flow.session.FlowSession;
2222
import com.codingapi.flow.workflow.Workflow;
@@ -33,13 +33,13 @@ public class FlowCreateService {
3333
private final FlowCreateRequest request;
3434
private final FlowOperatorGateway flowOperatorGateway;
3535
private final WorkflowRepository workflowRepository;
36-
private final WorkflowBackupRepository workflowBackupRepository;
36+
private final WorkflowRuntimeRepository workflowRuntimeRepository;
3737

3838
public FlowCreateService(FlowCreateRequest request) {
3939
this.request = request;
4040
this.flowOperatorGateway = RepositoryHolderContext.getInstance().getFlowOperatorGateway();
4141
this.workflowRepository = RepositoryHolderContext.getInstance().getWorkflowRepository();
42-
this.workflowBackupRepository = RepositoryHolderContext.getInstance().getWorkflowBackupRepository();
42+
this.workflowRuntimeRepository = RepositoryHolderContext.getInstance().getWorkflowRuntimeRepository();
4343
}
4444

4545
public long create() {
@@ -53,10 +53,10 @@ public long create() {
5353
}
5454
workflow.verify();
5555
// 获取备份
56-
WorkflowBackup workflowBackup = workflowBackupRepository.getByWorkId(workflow.getId(), workflow.getUpdatedTime());
57-
if (workflowBackup == null) {
58-
workflowBackup = new WorkflowBackup(workflow);
59-
workflowBackupRepository.save(workflowBackup);
56+
WorkflowRuntime workflowRuntime = workflowRuntimeRepository.getByWorkId(workflow.getId(), workflow.getUpdatedTime());
57+
if (workflowRuntime == null) {
58+
workflowRuntime = new WorkflowRuntime(workflow);
59+
workflowRuntimeRepository.save(workflowRuntime);
6060
}
6161
// 验证当前用户
6262
IFlowOperator currentOperator = flowOperatorGateway.get(request.getOperatorId());
@@ -69,7 +69,7 @@ public long create() {
6969

7070
StartNode currentNode = (StartNode) workflow.getStartNode();
7171
IFlowAction action = currentNode.actionManager().getActionById(request.getActionId());
72-
FlowSession session = FlowSession.startSession(currentOperator, workflow, currentNode, action, formData, workflowBackup.getId());
72+
FlowSession session = FlowSession.startSession(currentOperator, workflow, currentNode, action, formData, workflowRuntime.getId());
7373

7474
List<FlowRecord> flowRecords = currentNode.generateCurrentRecords(session);
7575

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

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

33
import com.codingapi.flow.action.IFlowAction;
4-
import com.codingapi.flow.backup.WorkflowBackup;
4+
import com.codingapi.flow.workflow.runtime.WorkflowRuntime;
55
import com.codingapi.flow.context.RepositoryHolderContext;
66
import com.codingapi.flow.domain.DelayTask;
77
import com.codingapi.flow.exception.FlowNotFoundException;
@@ -11,7 +11,7 @@
1111
import com.codingapi.flow.operator.IFlowOperator;
1212
import com.codingapi.flow.record.FlowRecord;
1313
import com.codingapi.flow.repository.FlowRecordRepository;
14-
import com.codingapi.flow.repository.WorkflowBackupRepository;
14+
import com.codingapi.flow.repository.WorkflowRuntimeRepository;
1515
import com.codingapi.flow.session.FlowAdvice;
1616
import com.codingapi.flow.session.FlowSession;
1717
import com.codingapi.flow.workflow.Workflow;
@@ -28,7 +28,7 @@ public class FlowDelayTriggerService {
2828
private final DelayTask delayTask;
2929
private final FlowOperatorGateway flowOperatorGateway;
3030
private final FlowRecordRepository flowRecordRepository;
31-
private final WorkflowBackupRepository workflowBackupRepository;
31+
private final WorkflowRuntimeRepository workflowRuntimeRepository;
3232

3333
/**
3434
* 延期任务触发执行
@@ -39,12 +39,12 @@ public void trigger() {
3939
throw FlowNotFoundException.record(delayTask.getCurrentRecordId());
4040
}
4141

42-
WorkflowBackup workflowBackup = workflowBackupRepository.get(flowRecord.getWorkBackupId());
43-
if (workflowBackup == null) {
42+
WorkflowRuntime workflowRuntime = workflowRuntimeRepository.get(flowRecord.getWorkBackupId());
43+
if (workflowRuntime == null) {
4444
throw FlowNotFoundException.workflow(flowRecord.getWorkBackupId() + " not found");
4545
}
4646

47-
Workflow workflow = workflowBackup.toWorkflow();
47+
Workflow workflow = workflowRuntime.toWorkflow();
4848
IFlowNode currentNode = workflow.getFlowNode(flowRecord.getNodeId());
4949

5050
IFlowOperator currentOperator = flowOperatorGateway.get(flowRecord.getCurrentOperatorId());

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

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

3-
import com.codingapi.flow.backup.WorkflowBackup;
3+
import com.codingapi.flow.workflow.runtime.WorkflowRuntime;
44
import com.codingapi.flow.context.RepositoryHolderContext;
55
import com.codingapi.flow.exception.FlowNotFoundException;
66
import com.codingapi.flow.node.IFlowNode;
@@ -24,14 +24,14 @@ public class FlowDetailService {
2424
private final IFlowOperator currentOperator;
2525
private final FlowRecordRepository flowRecordRepository;
2626
private final WorkflowRepository workflowRepository;
27-
private final WorkflowBackupRepository workflowBackupRepository;
27+
private final WorkflowRuntimeRepository workflowRuntimeRepository;
2828

2929
public FlowDetailService(FlowDetailRequest request) {
3030
this.request = request;
3131
this.currentOperator = RepositoryHolderContext.getInstance().getOperatorById(request.getOperatorId());
3232
this.flowRecordRepository = RepositoryHolderContext.getInstance().getFlowRecordRepository();
3333
this.workflowRepository = RepositoryHolderContext.getInstance().getWorkflowRepository();
34-
this.workflowBackupRepository = RepositoryHolderContext.getInstance().getWorkflowBackupRepository();
34+
this.workflowRuntimeRepository = RepositoryHolderContext.getInstance().getWorkflowRuntimeRepository();
3535
}
3636

3737
public FlowContent detail() {
@@ -46,11 +46,11 @@ public FlowContent detail() {
4646
if (flowRecord == null) {
4747
throw FlowNotFoundException.record(Long.parseLong(this.request.getId()));
4848
}
49-
WorkflowBackup workflowBackup = workflowBackupRepository.get(flowRecord.getWorkBackupId());
50-
if (workflowBackup == null) {
49+
WorkflowRuntime workflowRuntime = workflowRuntimeRepository.get(flowRecord.getWorkBackupId());
50+
if (workflowRuntime == null) {
5151
throw FlowNotFoundException.workflow(flowRecord.getWorkBackupId() + " not found");
5252
}
53-
Workflow workflow = workflowBackup.toWorkflow();
53+
Workflow workflow = workflowRuntime.toWorkflow();
5454

5555
if(!flowRecord.isReadable()){
5656
flowRecord.read();

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

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

33
import com.codingapi.flow.action.IFlowAction;
44
import com.codingapi.flow.action.actions.PassAction;
5-
import com.codingapi.flow.backup.WorkflowBackup;
5+
import com.codingapi.flow.workflow.runtime.WorkflowRuntime;
66
import com.codingapi.flow.context.RepositoryHolderContext;
77
import com.codingapi.flow.exception.FlowNotFoundException;
88
import com.codingapi.flow.form.FormData;
@@ -16,7 +16,7 @@
1616
import com.codingapi.flow.pojo.response.ProcessNode;
1717
import com.codingapi.flow.record.FlowRecord;
1818
import com.codingapi.flow.repository.FlowRecordRepository;
19-
import com.codingapi.flow.repository.WorkflowBackupRepository;
19+
import com.codingapi.flow.repository.WorkflowRuntimeRepository;
2020
import com.codingapi.flow.repository.WorkflowRepository;
2121
import com.codingapi.flow.session.FlowAdvice;
2222
import com.codingapi.flow.session.FlowSession;
@@ -35,7 +35,7 @@ public class FlowProcessNodeService {
3535
private final IFlowOperator currentOperator;
3636
private final FlowRecordRepository flowRecordRepository;
3737
private final WorkflowRepository workflowRepository;
38-
private final WorkflowBackupRepository workflowBackupRepository;
38+
private final WorkflowRuntimeRepository workflowRuntimeRepository;
3939

4040
// 当前的流程记录，当id为workId时flowRecord为空
4141
private FlowRecord flowRecord;
@@ -52,7 +52,7 @@ public FlowProcessNodeService(FlowProcessNodeRequest request) {
5252
this.currentOperator = RepositoryHolderContext.getInstance().getOperatorById(request.getOperatorId());
5353
this.flowRecordRepository = RepositoryHolderContext.getInstance().getFlowRecordRepository();
5454
this.workflowRepository = RepositoryHolderContext.getInstance().getWorkflowRepository();
55-
this.workflowBackupRepository = RepositoryHolderContext.getInstance().getWorkflowBackupRepository();
55+
this.workflowRuntimeRepository = RepositoryHolderContext.getInstance().getWorkflowRuntimeRepository();
5656
this.nodeList = new ArrayList<>();
5757
this.loadWorkflow();
5858
}
@@ -69,11 +69,11 @@ private void loadWorkflow() {
6969
throw FlowNotFoundException.record(Long.parseLong(id));
7070
}
7171
this.flowRecord = flowRecord;
72-
WorkflowBackup workflowBackup = workflowBackupRepository.get(flowRecord.getWorkBackupId());
73-
if (workflowBackup == null) {
72+
WorkflowRuntime workflowRuntime = workflowRuntimeRepository.get(flowRecord.getWorkBackupId());
73+
if (workflowRuntime == null) {
7474
throw FlowNotFoundException.workflow(flowRecord.getWorkBackupId() + " not found");
7575
}
76-
this.workflow = workflowBackup.toWorkflow();
76+
this.workflow = workflowRuntime.toWorkflow();
7777
this.currentNode = this.workflow.getFlowNode(flowRecord.getNodeId());
7878
}
7979
}

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

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

3-
import com.codingapi.flow.backup.WorkflowBackup;
3+
import com.codingapi.flow.workflow.runtime.WorkflowRuntime;
44
import com.codingapi.flow.context.RepositoryHolderContext;
55
import com.codingapi.flow.event.FlowRecordTodoEvent;
66
import com.codingapi.flow.event.IFlowEvent;
@@ -11,7 +11,7 @@
1111
import com.codingapi.flow.pojo.request.FlowRevokeRequest;
1212
import com.codingapi.flow.record.FlowRecord;
1313
import com.codingapi.flow.repository.FlowRecordRepository;
14-
import com.codingapi.flow.repository.WorkflowBackupRepository;
14+
import com.codingapi.flow.repository.WorkflowRuntimeRepository;
1515
import com.codingapi.flow.strategy.node.RevokeStrategy;
1616
import com.codingapi.flow.workflow.Workflow;
1717
import com.codingapi.springboot.framework.event.EventPusher;
@@ -26,12 +26,12 @@ public class FlowRevokeService {
2626

2727
private final FlowRevokeRequest request;
2828
private final FlowRecordRepository flowRecordRepository;
29-
private final WorkflowBackupRepository workflowBackupRepository;
29+
private final WorkflowRuntimeRepository workflowRuntimeRepository;
3030

3131
public FlowRevokeService(FlowRevokeRequest request) {
3232
this.request = request;
3333
this.flowRecordRepository = RepositoryHolderContext.getInstance().getFlowRecordRepository();
34-
this.workflowBackupRepository = RepositoryHolderContext.getInstance().getWorkflowBackupRepository();
34+
this.workflowRuntimeRepository = RepositoryHolderContext.getInstance().getWorkflowRuntimeRepository();
3535
}
3636

3737
public void revoke() {
@@ -51,11 +51,11 @@ public void revoke() {
5151
if (currentOperatorId != request.getOperatorId()) {
5252
throw FlowStateException.operatorNotMatch();
5353
}
54-
WorkflowBackup workflowBackup = workflowBackupRepository.get(currentRecord.getWorkBackupId());
55-
if (workflowBackup == null) {
54+
WorkflowRuntime workflowRuntime = workflowRuntimeRepository.get(currentRecord.getWorkBackupId());
55+
if (workflowRuntime == null) {
5656
throw FlowNotFoundException.workflow(currentRecord.getWorkBackupId() + " not found");
5757
}
58-
Workflow workflow = workflowBackup.toWorkflow();
58+
Workflow workflow = workflowRuntime.toWorkflow();
5959
IFlowNode currentNode = workflow.getFlowNode(currentRecord.getNodeId());
6060
NodeStrategyManager nodeStrategyManager = currentNode.strategyManager();
6161
RevokeStrategy revokeStrategy = nodeStrategyManager.getStrategy(RevokeStrategy.class);

0 commit comments

Comments
 (0)