From 6ad126cf6472a259a61a81199b5aeab2c183c934 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期日, 07 四月 2024 21:17:55 +0800
Subject: [PATCH] update 修改流程部署时更新流程定义配置
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
index 89a71db..77b2b0a 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
@@ -21,6 +21,7 @@
import org.dromara.workflow.domain.WfCategory;
import org.dromara.workflow.domain.WfNodeConfig;
import org.dromara.workflow.domain.bo.ProcessDefinitionBo;
+import org.dromara.workflow.domain.bo.WfDefinitionConfigBo;
import org.dromara.workflow.domain.vo.ProcessDefinitionVo;
import org.dromara.workflow.domain.vo.WfDefinitionConfigVo;
import org.dromara.workflow.service.IActProcessDefinitionService;
@@ -322,13 +323,14 @@
String processName = splitFilename[0];
//娴佺▼key
String processKey = splitFilename[1];
+ ProcessDefinition oldProcessDefinition = QueryUtils.definitionQuery().processDefinitionKey(processKey).latestVersion().singleResult();
DeploymentBuilder builder = repositoryService.createDeployment();
Deployment deployment = builder.addInputStream(filename, zipInputStream)
.tenantId(TenantHelper.getTenantId())
.name(processName).key(processKey).category(categoryCode).deploy();
ProcessDefinition definition = QueryUtils.definitionQuery().deploymentId(deployment.getId()).singleResult();
repositoryService.setProcessDefinitionCategory(definition.getId(), categoryCode);
- setWfNodeConfig(definition);
+ setWfConfig(oldProcessDefinition, definition);
zipInputStream.closeEntry();
}
} catch (IOException e) {
@@ -351,7 +353,7 @@
String processName = splitFilename[0];
//娴佺▼key
String processKey = splitFilename[1];
-
+ ProcessDefinition oldProcessDefinition = QueryUtils.definitionQuery().processDefinitionKey(processKey).latestVersion().singleResult();
DeploymentBuilder builder = repositoryService.createDeployment();
Deployment deployment = builder.addInputStream(originalFilename, inputStream)
.tenantId(TenantHelper.getTenantId())
@@ -359,8 +361,7 @@
// 鏇存柊鍒嗙被
ProcessDefinition definition = QueryUtils.definitionQuery().deploymentId(deployment.getId()).singleResult();
repositoryService.setProcessDefinitionCategory(definition.getId(), categoryCode);
- setWfNodeConfig(definition);
-
+ setWfConfig(oldProcessDefinition, definition);
} else {
throw new ServiceException("鏂囦欢绫诲瀷涓婁紶閿欒锛�");
}
@@ -371,9 +372,24 @@
/**
* 璁剧疆琛ㄥ崟鍐呭
*
- * @param definition 閮ㄧ讲鍚庢渶鏂版祦绋嬪畾涔�
+ * @param oldProcessDefinition 閮ㄧ讲鍓嶆渶鏂版祦绋嬪畾涔�
+ * @param definition 閮ㄧ讲鍚庢渶鏂版祦绋嬪畾涔�
*/
- private void setWfNodeConfig(ProcessDefinition definition) {
+ private void setWfConfig(ProcessDefinition oldProcessDefinition, ProcessDefinition definition) {
+ //鏇存柊娴佺▼瀹氫箟琛ㄥ崟
+ if (oldProcessDefinition != null) {
+ WfDefinitionConfigVo definitionVo = iWfDefinitionConfigService.getByDefId(oldProcessDefinition.getId());
+ if (definitionVo != null) {
+ iWfDefinitionConfigService.deleteByDefIds(Collections.singletonList(oldProcessDefinition.getId()));
+ WfDefinitionConfigBo wfFormDefinition = new WfDefinitionConfigBo();
+ wfFormDefinition.setDefinitionId(definition.getId());
+ wfFormDefinition.setProcessKey(definition.getKey());
+ wfFormDefinition.setTableName(definitionVo.getTableName());
+ wfFormDefinition.setVersion(definition.getVersion());
+ wfFormDefinition.setRemark(definitionVo.getRemark());
+ iWfDefinitionConfigService.saveOrUpdate(wfFormDefinition);
+ }
+ }
//鏇存柊娴佺▼鑺傜偣閰嶇疆琛ㄥ崟
List<UserTask> userTasks = ModelUtils.getUserTaskFlowElements(definition.getId());
UserTask applyUserTask = ModelUtils.getApplyUserTask(definition.getId());
--
Gitblit v1.9.3