mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

实列流程图还是恢复原来的逻辑

master
pengqiang 2021-11-19 16:58:24 +08:00
parent 6fe0776908
commit f3316d076b
1 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/main/java/cn/palmte/work/service/ActProcInsService.java
View File

@ -163,39 +163,49 @@ public class ActProcInsService {
public void createProcInsPng(HttpServletResponse response, String procInsId) throws IOException { public void createProcInsPng(HttpServletResponse response, String procInsId) throws IOException {
try { try {
//获取历史流程实例 HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(procInsId).singleResult(); //获取历史流程实例
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(procInsId).singleResult();
//获取流程中已经执行的节点，按照执行先后顺序排序 //获取流程中已经执行的节点，按照执行先后顺序排序
List<HistoricActivityInstance> hai = historyService.createHistoricActivityInstanceQuery().processInstanceId(procInsId).orderByHistoricActivityInstanceStartTime().asc().list(); List<HistoricActivityInstance> hai = historyService.createHistoricActivityInstanceQuery().processInstanceId(procInsId).orderByHistoricActivityInstanceStartTime().asc().list();
//开始和结束事件 // 历史流程节点中
List<HistoricActivityInstance> startEndEventList = new ArrayList<>(); List<HistoricActivityInstance> newHisActInstanceList = new ArrayList<HistoricActivityInstance>();
List<HistoricActivityInstance> activityInstanceList = new ArrayList<>(); List<HistoricActivityInstance> newHisTaskInstanceList = new ArrayList<HistoricActivityInstance>();
if (hai != null && hai.size() > 0) {
if (hai != null && !hai.isEmpty()) { for (int i = 0; i < hai.size(); i++) {
for (HistoricActivityInstance historicActivityInstance : hai) { HistoricActivityInstance historicActivityInstance = hai.get(i);
String activityType = historicActivityInstance.getActivityType(); String activityType = historicActivityInstance.getActivityType();
if (activityType.equals("startEvent") || activityType.equals("endEvent")) { if (activityType.equals("startEvent") || activityType.equals("endEvent")) {
startEndEventList.add(historicActivityInstance); newHisActInstanceList.add(historicActivityInstance);
} else if (activityType.equals("serviceTask") || activityType.equals("userTask") || activityType.equals("exclusiveGateway") || activityType.equals("parallelGateway")) { } else if (activityType.equals("serviceTask") || activityType.equals("userTask") || activityType.equals("exclusiveGateway") || activityType.equals("parallelGateway")) {
List<String> collect = activityInstanceList.stream().map(HistoricActivityInstance::getActivityId).collect(Collectors.toList()); if (newHisTaskInstanceList.size() > 0) {
if (collect.contains(historicActivityInstance.getActivityId())) { for (int j = 0; j < newHisTaskInstanceList.size(); j++) {
//情况已经执行任务 处理驳回的情况 HistoricActivityInstance historicTaskInstance = newHisTaskInstanceList.get(j);
activityInstanceList.clear(); if (historicTaskInstance.getActivityId().equals(historicActivityInstance.getActivityId())) { //如果列表中已包括
newHisTaskInstanceList.clear();
newHisTaskInstanceList.add(historicActivityInstance);
break;
} else {
newHisTaskInstanceList.add(historicActivityInstance);
break;
}
}
} else {
newHisTaskInstanceList.add(historicActivityInstance);
} }
activityInstanceList.add(historicActivityInstance);
} }
} }
} }
for (int i = 0; i < newHisActInstanceList.size(); i++) {
HistoricActivityInstance historicActivityInstance = newHisActInstanceList.get(i);
newHisTaskInstanceList.add(historicActivityInstance);
}
activityInstanceList.addAll(startEndEventList); List<String> executedActivityIdList = new ArrayList<String>(); // 构造已执行的节点ID集合
for (HistoricActivityInstance activityInstance : newHisTaskInstanceList) {
executedActivityIdList.add(activityInstance.getActivityId());
}
BpmnModel bpmnModel = repositoryService.getBpmnModel(historicProcessInstance.getProcessDefinitionId()); // 获取bpmnModel BpmnModel bpmnModel = repositoryService.getBpmnModel(historicProcessInstance.getProcessDefinitionId()); // 获取bpmnModel
List<String> flowIds = this.getExecutedFlows(bpmnModel, activityInstanceList); // 获取流程已发生流转的线ID集合 List<String> flowIds = this.getExecutedFlows(bpmnModel, newHisTaskInstanceList); // 获取流程已发生流转的线ID集合
actUtil.responsePng(response, bpmnModel, executedActivityIdList, flowIds);
List<String> idList = activityInstanceList.stream().map(HistoricActivityInstance::getActivityId).collect(Collectors.toList());
actUtil.responsePng(response, bpmnModel, idList, flowIds);
} catch (Exception e) { } catch (Exception e) {
logger.error("an exception happens in try catch statement", e); logger.error("an exception happens in try catch statement", e);
} }
@ -203,31 +213,35 @@ public class ActProcInsService {
} }
public List<String> getExecutedFlows(BpmnModel bpmnModel, List<HistoricActivityInstance> historicActivityInstances) { public List<String> getExecutedFlows(BpmnModel bpmnModel, List<HistoricActivityInstance> historicActivityInstances) {
List<String> flowIdList = new ArrayList<String>(); //流转线ID集合 List<String> flowIdList = new ArrayList<String>(); //流转线ID集合
List<FlowNode> historicFlowNodeList = new LinkedList<FlowNode>(); //全部活动实例 List<FlowNode> historicFlowNodeList = new LinkedList<FlowNode>(); //全部活动实例
List<HistoricActivityInstance> finishedActivityInstanceList = new LinkedList<HistoricActivityInstance>(); //已完成的历史活动节点 List<HistoricActivityInstance> finishedActivityInstanceList = new LinkedList<HistoricActivityInstance>(); //已完成的历史活动节点
List list = new ArrayList(); List list = new ArrayList();
Process mainProcess = bpmnModel.getMainProcess();
for (HistoricActivityInstance historicActivityInstance : historicActivityInstances) { for (HistoricActivityInstance historicActivityInstance : historicActivityInstances) {
FlowNode flowElement = (FlowNode) mainProcess.getFlowElement(historicActivityInstance.getActivityId(), true); historicFlowNodeList.add((FlowNode) bpmnModel.getMainProcess().getFlowElement(historicActivityInstance.getActivityId(), true));
historicFlowNodeList.add(flowElement);
if (historicActivityInstance.getEndTime() != null) { if (historicActivityInstance.getEndTime() != null) {
finishedActivityInstanceList.add(historicActivityInstance); finishedActivityInstanceList.add(historicActivityInstance);
} }
}
for (int x = 0; x < historicActivityInstances.size(); x++) {
HistoricActivityInstance historicActivityInstance = historicActivityInstances.get(x);
String activityType = historicActivityInstance.getActivityType();
String activityId = historicActivityInstance.getActivityId(); String activityId = historicActivityInstance.getActivityId();
if (!list.contains(activityId)) { if (!list.contains(activityId) && ("userTask".equals(activityType)
|| "serviceTask".equals(activityType)
|| "endEvent".equals(activityType)
|| "exclusiveGateway".equals(activityType)
|| "parallelGateway".equals(activityType))) {
list.add(activityId); list.add(activityId);
} }
} }
/**遍历已完成的活动实例，从每个实例的outgoingFlows中找到已执行的*/ /**遍历已完成的活动实例，从每个实例的outgoingFlows中找到已执行的*/
FlowNode currentFlowNode = null; FlowNode currentFlowNode = null;
for (HistoricActivityInstance currentActivityInstance : finishedActivityInstanceList) { for (HistoricActivityInstance currentActivityInstance : finishedActivityInstanceList) {
/**获得当前活动对应的节点信息及outgoingFlows信息*/ /**获得当前活动对应的节点信息及outgoingFlows信息*/
currentFlowNode = (FlowNode) mainProcess.getFlowElement(currentActivityInstance.getActivityId(), true); currentFlowNode = (FlowNode) bpmnModel.getMainProcess().getFlowElement(currentActivityInstance.getActivityId(), true);
List<SequenceFlow> sequenceFlowList = currentFlowNode.getOutgoingFlows(); List<SequenceFlow> sequenceFlowList = currentFlowNode.getOutgoingFlows();
/** /**
* 遍历outgoingFlows并找到已流转的 * 遍历outgoingFlows并找到已流转的
@ -236,15 +250,17 @@ public class ActProcInsService {
* 2.当前节点是以上两种类型之外的，通过outgoingFlows查找到的时间最近的流转节点视为有效流转 * 2.当前节点是以上两种类型之外的，通过outgoingFlows查找到的时间最近的流转节点视为有效流转
*/ */
FlowNode targetFlowNode = null; FlowNode targetFlowNode = null;
if ("parallelGateway".equals(currentActivityInstance.getActivityType()) || "inclusiveGateway".equals(currentActivityInstance.getActivityType())) { if ("parallelGateway".equals(currentActivityInstance.getActivityType())
|| "inclusiveGateway".equals(currentActivityInstance.getActivityType())) {
for (SequenceFlow sequenceFlow : sequenceFlowList) { //遍历历史活动节点，找到匹配Flow目标节点的 for (SequenceFlow sequenceFlow : sequenceFlowList) { //遍历历史活动节点，找到匹配Flow目标节点的
targetFlowNode = (FlowNode) mainProcess.getFlowElement(sequenceFlow.getTargetRef(), true); targetFlowNode = (FlowNode) bpmnModel.getMainProcess().getFlowElement(sequenceFlow.getTargetRef(), true);
if (historicFlowNodeList.contains(targetFlowNode)) { if (historicFlowNodeList.contains(targetFlowNode)) {
flowIdList.add(sequenceFlow.getId()); flowIdList.add(sequenceFlow.getId());
} }
} }
} else { } else {
List<Map<String, String>> tempMapList = new LinkedList<Map<String, String>>(); List<Map<String, String>> tempMapList = new LinkedList<Map<String, String>>();
// for(SequenceFlow sequenceFlow : sequenceFlowList) { //遍历历史活动节点，找到匹配Flow目标节点的
for (int i = 0; i < sequenceFlowList.size(); i++) { //遍历历史活动节点，找到匹配Flow目标节点的 for (int i = 0; i < sequenceFlowList.size(); i++) { //遍历历史活动节点，找到匹配Flow目标节点的
SequenceFlow sequenceFlow = sequenceFlowList.get(i); SequenceFlow sequenceFlow = sequenceFlowList.get(i);
int taskSeq = list.indexOf(sequenceFlow.getSourceRef()); // 获取当前flow目标节点key在审批顺序 int taskSeq = list.indexOf(sequenceFlow.getSourceRef()); // 获取当前flow目标节点key在审批顺序
@ -271,9 +287,9 @@ public class ActProcInsService {
flowId = map.get("flowId"); flowId = map.get("flowId");
flowIdList.add(flowId); flowIdList.add(flowId);
} }
} }
} }
return flowIdList; return flowIdList;
} }
} }