From 040ecb2532859f369518cb49287c5c2d4cf22308 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期一, 08 四月 2024 21:30:36 +0800
Subject: [PATCH] add 添加初始化配置数据（demo使用，不用可删除）
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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 b8b882e..1627eba 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
@@ -19,11 +19,13 @@
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.domain.WfCategory;
+import org.dromara.workflow.domain.WfDefinitionConfig;
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.mapper.WfDefinitionConfigMapper;
import org.dromara.workflow.service.IActProcessDefinitionService;
import org.dromara.workflow.service.IWfCategoryService;
import org.dromara.workflow.service.IWfDefinitionConfigService;
@@ -62,6 +64,7 @@
private final ProcessMigrationService processMigrationService;
private final IWfCategoryService wfCategoryService;
private final IWfDefinitionConfigService iWfDefinitionConfigService;
+ private final WfDefinitionConfigMapper wfDefinitionConfigMapper;
private final IWfNodeConfigService iWfNodeConfigService;
/**
@@ -330,7 +333,7 @@
.name(processName).key(processKey).category(categoryCode).deploy();
ProcessDefinition definition = QueryUtils.definitionQuery().deploymentId(deployment.getId()).singleResult();
repositoryService.setProcessDefinitionCategory(definition.getId(), categoryCode);
- setForm(oldProcessDefinition, definition);
+ setWfConfig(oldProcessDefinition, definition);
zipInputStream.closeEntry();
}
} catch (IOException e) {
@@ -340,6 +343,8 @@
zipInputStream.close();
}
}
+ //鍒濆鍖栭厤缃暟鎹紙demo浣跨敤锛屼笉鐢ㄥ彲鍒犻櫎锛�
+ initWfDefConfig();
} else {
String originalFilename = file.getOriginalFilename();
String bpmnResourceSuffix = ResourceNameUtil.BPMN_RESOURCE_SUFFIXES[0];
@@ -354,7 +359,6 @@
//娴佺▼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())
@@ -362,10 +366,28 @@
// 鏇存柊鍒嗙被
ProcessDefinition definition = QueryUtils.definitionQuery().deploymentId(deployment.getId()).singleResult();
repositoryService.setProcessDefinitionCategory(definition.getId(), categoryCode);
- setForm(oldProcessDefinition, definition);
-
+ setWfConfig(oldProcessDefinition, definition);
} else {
throw new ServiceException("鏂囦欢绫诲瀷涓婁紶閿欒锛�");
+ }
+ }
+
+ }
+
+ /**
+ * 鍒濆鍖栭厤缃暟鎹紙demo浣跨敤锛屼笉鐢ㄥ彲鍒犻櫎锛�
+ */
+ private void initWfDefConfig() {
+ List<WfDefinitionConfig> wfDefinitionConfigs = wfDefinitionConfigMapper.selectList();
+ if (CollUtil.isEmpty(wfDefinitionConfigs)) {
+ ProcessDefinition processDefinition = QueryUtils.definitionQuery().processDefinitionKey("leave1").latestVersion().singleResult();
+ if (processDefinition != null) {
+ WfDefinitionConfigBo wfFormDefinition = new WfDefinitionConfigBo();
+ wfFormDefinition.setDefinitionId(processDefinition.getId());
+ wfFormDefinition.setProcessKey(processDefinition.getKey());
+ wfFormDefinition.setTableName("test_leave");
+ wfFormDefinition.setVersion(processDefinition.getVersion());
+ iWfDefinitionConfigService.saveOrUpdate(wfFormDefinition);
}
}
@@ -377,21 +399,24 @@
* @param oldProcessDefinition 閮ㄧ讲鍓嶆渶鏂版祦绋嬪畾涔�
* @param definition 閮ㄧ讲鍚庢渶鏂版祦绋嬪畾涔�
*/
- private void setForm(ProcessDefinition oldProcessDefinition, 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.setFormId(ObjectUtil.isNotNull(definitionVo.getFormId()) ? definitionVo.getFormId() : null);
+ wfFormDefinition.setTableName(definitionVo.getTableName());
+ wfFormDefinition.setVersion(definition.getVersion());
wfFormDefinition.setRemark(definitionVo.getRemark());
iWfDefinitionConfigService.saveOrUpdate(wfFormDefinition);
}
}
//鏇存柊娴佺▼鑺傜偣閰嶇疆琛ㄥ崟
- List<UserTask> userTasks = ModelUtils.getuserTaskFlowElements(definition.getId());
+ List<UserTask> userTasks = ModelUtils.getUserTaskFlowElements(definition.getId());
+ UserTask applyUserTask = ModelUtils.getApplyUserTask(definition.getId());
List<WfNodeConfig> wfNodeConfigList = new ArrayList<>();
for (UserTask userTask : userTasks) {
if (StringUtils.isNotBlank(userTask.getFormKey()) && userTask.getFormKey().contains(StrUtil.COLON)) {
@@ -402,6 +427,7 @@
String[] split = userTask.getFormKey().split(StrUtil.COLON);
wfNodeConfig.setFormType(split[0]);
wfNodeConfig.setFormId(Long.valueOf(split[1]));
+ wfNodeConfig.setApplyUserTask(applyUserTask.getId().equals(userTask.getId()) ? FlowConstant.TRUE : FlowConstant.FALSE);
wfNodeConfigList.add(wfNodeConfig);
}
}
--
Gitblit v1.9.3