Skip to content

Commit 29f612c

Browse files
committed
add startFlow opinion
1 parent 1befcc1 commit 29f612c

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/event/FlowApprovalEvent.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.codingapi.springboot.flow.event;
22

3+
import com.codingapi.springboot.flow.bind.IBindData;
34
import com.codingapi.springboot.flow.domain.FlowWork;
45
import com.codingapi.springboot.flow.record.FlowRecord;
56
import com.codingapi.springboot.flow.user.IFlowOperator;
@@ -37,12 +38,14 @@ public class FlowApprovalEvent implements ISyncEvent {
3738
private final IFlowOperator operator;
3839
private final FlowRecord flowRecord;
3940
private final FlowWork flowWork;
41+
private final IBindData bindData;
4042

41-
public FlowApprovalEvent(int state, FlowRecord flowRecord, IFlowOperator operator, FlowWork flowWork) {
43+
public FlowApprovalEvent(int state, FlowRecord flowRecord, IFlowOperator operator, FlowWork flowWork,IBindData bindData) {
4244
this.state = state;
4345
this.operator = operator;
4446
this.flowRecord = flowRecord;
4547
this.flowWork = flowWork;
48+
this.bindData = bindData;
4649
log.debug("FlowApprovalEvent:{}", this);
4750
}
4851

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void urge(long recordId, IFlowOperator currentOperator) {
9595
// 推送催办消息
9696
for (FlowRecord record : todoRecords) {
9797
IFlowOperator pushOperator = flowOperatorRepository.getFlowOperatorById(record.getCurrentOperatorId());
98-
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_URGE, record, pushOperator, flowWork));
98+
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_URGE, record, pushOperator, flowWork,null));
9999
}
100100

101101
}
@@ -214,10 +214,10 @@ public void transfer(long recordId, IFlowOperator currentOperator, IFlowOperator
214214
flowRecordRepository.save(List.of(transferRecord));
215215

216216
// 推送转办消息
217-
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TRANSFER, flowRecord, currentOperator, flowWork));
217+
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TRANSFER, flowRecord, currentOperator, flowWork,snapshot.toBindData()));
218218

219219
// 推送待办消息
220-
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO, transferRecord, targetOperator, flowWork));
220+
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO, transferRecord, targetOperator, flowWork,snapshot.toBindData()));
221221
}
222222

223223

@@ -320,8 +320,8 @@ public void startFlow(long workId, IFlowOperator operator, IBindData bindData, S
320320

321321
// 推送事件消息
322322
for (FlowRecord record : records) {
323-
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_CREATE, record, operator, flowWork));
324-
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO, record, operator, flowWork));
323+
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_CREATE, record, operator, flowWork,snapshot.toBindData()));
324+
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO, record, operator, flowWork,snapshot.toBindData()));
325325
}
326326

327327
}
@@ -412,7 +412,7 @@ public void submitFlow(long recordId, IFlowOperator currentOperator, IBindData b
412412
flowRecordRepository.update(flowRecord);
413413
flowRecordRepository.finishFlowRecordByProcessId(flowRecord.getProcessId());
414414

415-
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_FINISH, flowRecord, currentOperator, flowWork));
415+
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_FINISH, flowRecord, currentOperator, flowWork,snapshot.toBindData()));
416416
return;
417417
}
418418

@@ -451,12 +451,12 @@ public void submitFlow(long recordId, IFlowOperator currentOperator, IBindData b
451451

452452
// 推送审批事件消息
453453
int eventState = flowSourceDirection == FlowSourceDirection.PASS ? FlowApprovalEvent.STATE_PASS : FlowApprovalEvent.STATE_REJECT;
454-
EventPusher.push(new FlowApprovalEvent(eventState, flowRecord, currentOperator, flowWork));
454+
EventPusher.push(new FlowApprovalEvent(eventState, flowRecord, currentOperator, flowWork,snapshot.toBindData()));
455455

456456
// 推送待办事件消息
457457
for (FlowRecord record : records) {
458458
IFlowOperator pushOperator = flowOperatorRepository.getFlowOperatorById(record.getCurrentOperatorId());
459-
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO, record, pushOperator, flowWork));
459+
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO, record, pushOperator, flowWork,snapshot.toBindData()));
460460
}
461461
}
462462

@@ -498,7 +498,7 @@ public void recall(long recordId, IFlowOperator currentOperator) {
498498
flowRecordRepository.update(flowRecord);
499499

500500
flowRecordRepository.delete(childrenRecords);
501-
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_RECALL, flowRecord, currentOperator, flowWork));
501+
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_RECALL, flowRecord, currentOperator, flowWork,null));
502502
}
503503

504504
}

0 commit comments

Comments
 (0)