From 6954fdec0a01ec0e359cd878cc5af644299a3ed9 Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: 星期三, 27 三月 2024 14:19:34 +0800
Subject: [PATCH] fix 修复工具类可能出现空指针情况
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java
index 0d59b85..7906287 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java
@@ -9,6 +9,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.json.utils.JsonUtils;
@@ -17,7 +18,7 @@
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
import org.flowable.editor.language.json.converter.BpmnJsonConverter;
-import org.flowable.engine.impl.util.ProcessDefinitionUtil;
+import org.flowable.engine.ProcessEngine;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
@@ -36,6 +37,8 @@
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class ModelUtils {
+
+ private static final ProcessEngine PROCESS_ENGINE = SpringUtils.getBean(ProcessEngine.class);
public static BpmnModel xmlToBpmnModel(String xml) throws IOException {
if (xml == null) {
@@ -166,7 +169,7 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
public static List<FlowElement> getFlowElements(String processDefinitionId) {
- BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(processDefinitionId);
+ BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId);
List<FlowElement> list = new ArrayList<>();
List<Process> processes = bpmnModel.getProcesses();
Collection<FlowElement> flowElements = processes.get(0).getFlowElements();
@@ -213,7 +216,7 @@
* @param flowElementId 鑺傜偣id
*/
public static Map<String, List<ExtensionElement>> getExtensionElement(String processDefinitionId, String flowElementId) {
- BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(processDefinitionId);
+ BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId);
Process process = bpmnModel.getMainProcess();
FlowElement flowElement = process.getFlowElement(flowElementId);
return flowElement.getExtensionElements();
@@ -226,7 +229,7 @@
* @param taskDefinitionKey 娴佺▼瀹氫箟id
*/
public static boolean isUserTask(String processDefinitionId, String taskDefinitionKey) {
- BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(processDefinitionId);
+ BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId);
FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(taskDefinitionKey);
return flowNode instanceof UserTask;
}
--
Gitblit v1.9.3