wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add - 新增取消流程实例的接口

Browse Source
This commit is contained in:
wangli 2023-07-17 11:25:01 +08:00
parent e01c3d4d6d
commit 0cb09a5316
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmProcessInstanceService.java
View File

@ -24,15 +24,12 @@ public interface BpmProcessInstanceService {
/**
* 取消流程实例
*
* @return
* @return true or false, true mean's cancelled
*/
Boolean cancelProcessInstance(BpmProcessInstanceCancelDTO processInstanceCancelDTO);
/**
* 我发起的审批列表
* */
/**
* 获得流程实例的分页
* 获得流程实例的分页 / 我发起的审批列表
*
* @param pageReqVO 分页请求
* @return 流程实例的分页

18
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmProcessInstanceServiceImpl.java
View File

@ -28,6 +28,7 @@ import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.engine.*;
import org.flowable.engine.delegate.event.FlowableCancelledEvent;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.engine.runtime.ProcessInstanceQuery;
@ -205,16 +206,21 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
@Override
public HistoricProcessInstance getHistoricProcessInstance(String id, String tenantId) {
return historyService.createHistoricProcessInstanceQuery().processInstanceId(id)
.processInstanceTenantId(tenantId)
.singleResult();
HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().processInstanceId(id);
if (StringUtils.isNotBlank(tenantId)) {
query.processInstanceTenantId(tenantId);
}
return query.singleResult();
}
public HistoricProcessInstance getHistoricProcessInstanceByBusinessKey(String businessKey, String tenantId) {
return historyService.createHistoricProcessInstanceQuery().processInstanceBusinessKey(businessKey)
.processInstanceTenantId(tenantId)
.singleResult();
HistoricProcessInstanceQuery query =
historyService.createHistoricProcessInstanceQuery().processInstanceBusinessKey(businessKey);
if (StringUtils.isNotBlank(tenantId)) {
query.processInstanceTenantId(tenantId);
}
return query.singleResult();
}
@Override

2
workflow-engine-server/src/main/java/cn/axzo/server/controller/listener/CustomBpmProcessEventListener.java
View File

@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
* @author wangli
* @since 2023/7/10 18:22
*/
@Profile("local")
@Profile({"local", "dev"})
@Slf4j
@Component
public class CustomBpmProcessEventListener implements BpmProcessEventListener {

2
workflow-engine-server/src/main/java/cn/axzo/server/controller/listener/CustomBpmTaskEventListener.java
View File

@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
* @author wangli
* @since 2023/7/10 18:22
*/
@Profile("local")
@Profile({"local", "dev"})
@Component
public class CustomBpmTaskEventListener implements BpmTaskEventListener {
@Override

1
workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmProcessInstanceController.java
View File

@ -45,6 +45,7 @@ public class BpmProcessInstanceController {
return CommonResponse.success(result);
}
@DeleteMapping("/cancel")
public CommonResponse<Boolean> cancelProcessInstant(@Valid @RequestBody BpmProcessInstanceCancelDTO dto) {
log.info("取消审核cancelProcessInstant===>>>参数：{}", JSON.toJSONString(dto));
return CommonResponse.success(bpmProcessInstanceService.cancelProcessInstance(dto));