From d36af1e4c9f7601b97dac825744a0df2b809f0b9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 06 八月 2025 17:02:19 +0800
Subject: [PATCH] 固化流程,建立node;OK

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
index 689ce47..c56e955 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
@@ -1,7 +1,9 @@
 package org.springblade.mdm.flow.service;
 
 import lombok.AllArgsConstructor;
+import org.flowable.engine.HistoryService;
 import org.flowable.engine.RuntimeService;
+import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springblade.mdm.flow.constants.FlowContants;
 import org.springframework.stereotype.Service;
@@ -12,7 +14,7 @@
 @Service
 public class FlowCommonService {
 	private final RuntimeService runtimeService;
-
+	private final HistoryService historyService;
 	/**
 	 * 鏍规嵁娴佺▼瀹炰緥id鑾峰彇definitionKey
 	 * @param processInstanceId
@@ -43,12 +45,43 @@
 
 		programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
 		programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//宸ュ簭鐗堟
+		programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
 		programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));
 		//鏁版嵁澶勭悊鍚嶇О涓虹増娆′互鍓嶏紝闆朵欢鍙峰姞宸ュ簭鍙凤細YZL4-1100-01-50 闆剁粍浠跺彿锛歒ZL4-1100-01 宸ュ簭鍙� 50
 
 		programProperties.setCraftEdition(String.valueOf(vars.get(FlowContants.CRAFT_EDITION)));
 		programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowContants.HAS_CURED_PROGRAM)));
+
+		ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
+			.processInstanceId(processInstanceId)
+			.singleResult();
+		String processDefinitionKey = processInstance.getProcessDefinitionKey();
+		programProperties.setProcessDefinitionKey(processDefinitionKey);
 		return programProperties;
 	}
 
+	/**
+	 * 娴佺▼鏄惁鍦ㄨ繘琛�
+	 * @param processInstanceId 瀹炰緥id
+	 */
+	public boolean isProcessInstanceActive(String processInstanceId) {
+		if(processInstanceId == null){
+			return false;
+		}
+		// 鍏堟煡杩愯鏃惰〃
+		ProcessInstance instance = runtimeService.createProcessInstanceQuery()
+			.processInstanceId(processInstanceId)
+			.singleResult();
+
+		if (instance != null) {
+			return true;
+		}
+
+		// 鍐嶆煡鍘嗗彶琛ㄧ‘璁ゆ槸鍚︽浘缁忓瓨鍦�
+		HistoricProcessInstance historicInstance = historyService.createHistoricProcessInstanceQuery()
+			.processInstanceId(processInstanceId)
+			.singleResult();
+
+		return historicInstance != null && historicInstance.getEndTime() == null;
+	}
 }

--
Gitblit v1.9.3