From 1da98c8a8207dd062e433242e1567b6418c6ed81 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期六, 06 四月 2024 11:20:29 +0800
Subject: [PATCH] update 优化表单绑定逻辑，移除流程定义配置表单
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java | 278 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 174 insertions(+), 104 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 fda10d3..89a71db 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
@@ -4,40 +4,48 @@
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.apache.commons.io.IOUtils;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
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.WfNodeConfig;
import org.dromara.workflow.domain.bo.ProcessDefinitionBo;
import org.dromara.workflow.domain.vo.ProcessDefinitionVo;
+import org.dromara.workflow.domain.vo.WfDefinitionConfigVo;
import org.dromara.workflow.service.IActProcessDefinitionService;
import org.dromara.workflow.service.IWfCategoryService;
-import org.flowable.engine.HistoryService;
+import org.dromara.workflow.service.IWfDefinitionConfigService;
+import org.dromara.workflow.service.IWfNodeConfigService;
+import org.dromara.workflow.utils.ModelUtils;
+import org.dromara.workflow.utils.QueryUtils;
+import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.ProcessMigrationService;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.impl.bpmn.deployer.ResourceNameUtil;
-import org.flowable.engine.repository.Deployment;
-import org.flowable.engine.repository.Model;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.engine.repository.ProcessDefinitionQuery;
+import org.flowable.engine.repository.*;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
-import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
/**
@@ -50,55 +58,61 @@
public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionService {
private final RepositoryService repositoryService;
-
- private final HistoryService historyService;
-
private final ProcessMigrationService processMigrationService;
-
private final IWfCategoryService wfCategoryService;
+ private final IWfDefinitionConfigService iWfDefinitionConfigService;
+ private final IWfNodeConfigService iWfNodeConfigService;
/**
* 鍒嗛〉鏌ヨ
*
- * @param processDefinitionBo 鍙傛暟
+ * @param bo 鍙傛暟
* @return 杩斿洖鍒嗛〉鍒楄〃
*/
@Override
- public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo) {
- ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
- query.processDefinitionTenantId(TenantHelper.getTenantId());
- if (StringUtils.isNotEmpty(processDefinitionBo.getKey())) {
- query.processDefinitionKey(processDefinitionBo.getKey());
+ public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo bo, PageQuery pageQuery) {
+ ProcessDefinitionQuery query = QueryUtils.definitionQuery();
+ if (StringUtils.isNotEmpty(bo.getKey())) {
+ query.processDefinitionKey(bo.getKey());
}
- if (StringUtils.isNotEmpty(processDefinitionBo.getCategoryCode())) {
- query.processDefinitionCategory(processDefinitionBo.getCategoryCode());
+ if (StringUtils.isNotEmpty(bo.getCategoryCode())) {
+ query.processDefinitionCategory(bo.getCategoryCode());
}
- if (StringUtils.isNotEmpty(processDefinitionBo.getName())) {
- query.processDefinitionNameLike("%" + processDefinitionBo.getName() + "%");
+ if (StringUtils.isNotEmpty(bo.getName())) {
+ query.processDefinitionNameLike("%" + bo.getName() + "%");
}
query.orderByDeploymentId().desc();
// 鍒嗛〉鏌ヨ
List<ProcessDefinitionVo> processDefinitionVoList = new ArrayList<>();
- List<ProcessDefinition> definitionList = query.latestVersion().listPage(processDefinitionBo.getPageNum(), processDefinitionBo.getPageSize());
+ List<ProcessDefinition> definitionList = query.latestVersion().listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
List<Deployment> deploymentList = null;
if (CollUtil.isNotEmpty(definitionList)) {
List<String> deploymentIds = StreamUtils.toList(definitionList, ProcessDefinition::getDeploymentId);
- deploymentList = repositoryService.createDeploymentQuery().deploymentIds(deploymentIds).list();
+ deploymentList = QueryUtils.deploymentQuery(deploymentIds).list();
}
- for (ProcessDefinition processDefinition : definitionList) {
- ProcessDefinitionVo processDefinitionVo = BeanUtil.toBean(processDefinition, ProcessDefinitionVo.class);
- if (CollUtil.isNotEmpty(deploymentList)) {
- // 閮ㄧ讲鏃堕棿
- deploymentList.stream().filter(e -> e.getId().equals(processDefinition.getDeploymentId())).findFirst().ifPresent(e -> {
- processDefinitionVo.setDeploymentTime(e.getDeploymentTime());
- });
+ if (CollUtil.isNotEmpty(definitionList)) {
+ List<String> ids = StreamUtils.toList(definitionList, ProcessDefinition::getId);
+ List<WfDefinitionConfigVo> wfDefinitionConfigVos = iWfDefinitionConfigService.queryList(ids);
+ for (ProcessDefinition processDefinition : definitionList) {
+ ProcessDefinitionVo processDefinitionVo = BeanUtil.toBean(processDefinition, ProcessDefinitionVo.class);
+ if (CollUtil.isNotEmpty(deploymentList)) {
+ // 閮ㄧ讲鏃堕棿
+ deploymentList.stream().filter(e -> e.getId().equals(processDefinition.getDeploymentId())).findFirst().ifPresent(e -> {
+ processDefinitionVo.setDeploymentTime(e.getDeploymentTime());
+ });
+ }
+ if (CollUtil.isNotEmpty(wfDefinitionConfigVos)) {
+ wfDefinitionConfigVos.stream().filter(e -> e.getDefinitionId().equals(processDefinition.getId())).findFirst().ifPresent(processDefinitionVo::setWfDefinitionConfigVo);
+ }
+ processDefinitionVoList.add(processDefinitionVo);
}
- processDefinitionVoList.add(processDefinitionVo);
}
// 鎬昏褰曟暟
long total = query.count();
-
- return new TableDataInfo<>(processDefinitionVoList, total);
+ TableDataInfo<ProcessDefinitionVo> build = TableDataInfo.build();
+ build.setRows(processDefinitionVoList);
+ build.setTotal(total);
+ return build;
}
/**
@@ -107,25 +121,31 @@
* @param key 娴佺▼瀹氫箟key
*/
@Override
- public List<ProcessDefinitionVo> getProcessDefinitionListByKey(String key) {
+ public List<ProcessDefinitionVo> getListByKey(String key) {
List<ProcessDefinitionVo> processDefinitionVoList = new ArrayList<>();
- ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
- List<ProcessDefinition> definitionList = query.processDefinitionTenantId(TenantHelper.getTenantId()).processDefinitionKey(key).list();
+ ProcessDefinitionQuery query = QueryUtils.definitionQuery();
+ List<ProcessDefinition> definitionList = query.processDefinitionKey(key).list();
List<Deployment> deploymentList = null;
if (CollUtil.isNotEmpty(definitionList)) {
- List<String> deploymentIds = definitionList.stream().map(ProcessDefinition::getDeploymentId).collect(Collectors.toList());
- deploymentList = repositoryService.createDeploymentQuery()
- .deploymentIds(deploymentIds).list();
+ List<String> deploymentIds = StreamUtils.toList(definitionList, ProcessDefinition::getDeploymentId);
+ deploymentList = QueryUtils.deploymentQuery(deploymentIds).list();
}
- for (ProcessDefinition processDefinition : definitionList) {
- ProcessDefinitionVo processDefinitionVo = BeanUtil.toBean(processDefinition, ProcessDefinitionVo.class);
- if (CollUtil.isNotEmpty(deploymentList)) {
- // 閮ㄧ讲鏃堕棿
- deploymentList.stream().filter(e -> e.getId().equals(processDefinition.getDeploymentId())).findFirst().ifPresent(e -> {
- processDefinitionVo.setDeploymentTime(e.getDeploymentTime());
- });
+ if (CollUtil.isNotEmpty(definitionList)) {
+ List<String> ids = StreamUtils.toList(definitionList, ProcessDefinition::getId);
+ List<WfDefinitionConfigVo> wfDefinitionConfigVos = iWfDefinitionConfigService.queryList(ids);
+ for (ProcessDefinition processDefinition : definitionList) {
+ ProcessDefinitionVo processDefinitionVo = BeanUtil.toBean(processDefinition, ProcessDefinitionVo.class);
+ if (CollUtil.isNotEmpty(deploymentList)) {
+ // 閮ㄧ讲鏃堕棿
+ deploymentList.stream().filter(e -> e.getId().equals(processDefinition.getDeploymentId())).findFirst().ifPresent(e -> {
+ processDefinitionVo.setDeploymentTime(e.getDeploymentTime());
+ });
+ if (CollUtil.isNotEmpty(wfDefinitionConfigVos)) {
+ wfDefinitionConfigVos.stream().filter(e -> e.getDefinitionId().equals(processDefinition.getId())).findFirst().ifPresent(processDefinitionVo::setWfDefinitionConfigVo);
+ }
+ }
+ processDefinitionVoList.add(processDefinitionVo);
}
- processDefinitionVoList.add(processDefinitionVo);
}
return CollectionUtil.reverse(processDefinitionVoList);
}
@@ -137,7 +157,7 @@
*/
@SneakyThrows
@Override
- public String processDefinitionImage(String processDefinitionId) {
+ public String definitionImage(String processDefinitionId) {
InputStream inputStream = repositoryService.getProcessDiagram(processDefinitionId);
return Base64.encode(IOUtils.toByteArray(inputStream));
}
@@ -148,7 +168,7 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
@Override
- public String processDefinitionXml(String processDefinitionId) {
+ public String definitionXml(String processDefinitionId) {
StringBuilder xml = new StringBuilder();
ProcessDefinition processDefinition = repositoryService.getProcessDefinition(processDefinitionId);
InputStream inputStream;
@@ -168,15 +188,20 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean deleteDeployment(String deploymentId, String processDefinitionId) {
try {
- List<HistoricTaskInstance> taskInstanceList = historyService.createHistoricTaskInstanceQuery()
+ List<HistoricTaskInstance> taskInstanceList = QueryUtils.hisTaskInstanceQuery()
.processDefinitionId(processDefinitionId).list();
if (CollectionUtil.isNotEmpty(taskInstanceList)) {
throw new ServiceException("褰撳墠娴佺▼瀹氫箟宸茶浣跨敤涓嶅彲鍒犻櫎锛�");
}
//鍒犻櫎娴佺▼瀹氫箟
repositoryService.deleteDeployment(deploymentId);
+ //鍒犻櫎娴佺▼瀹氫箟閰嶇疆
+ iWfDefinitionConfigService.deleteByDefIds(Collections.singletonList(processDefinitionId));
+ //鍒犻櫎鑺傜偣閰嶇疆
+ iWfNodeConfigService.deleteByDefIds(Collections.singletonList(processDefinitionId));
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -190,10 +215,10 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
@Override
- public boolean updateProcessDefState(String processDefinitionId) {
+ public boolean updateDefinitionState(String processDefinitionId) {
try {
- ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
- .processDefinitionId(processDefinitionId).processDefinitionTenantId(TenantHelper.getTenantId()).singleResult();
+ ProcessDefinition processDefinition = QueryUtils.definitionQuery()
+ .processDefinitionId(processDefinitionId).singleResult();
//灏嗗綋鍓嶄负鎸傝捣鐘舵�佹洿鏂颁负婵�娲荤姸鎬�
//鍙傛暟璇存槑锛氬弬鏁�1锛氭祦绋嬪畾涔塱d,鍙傛暟2锛氭槸鍚︽縺娲伙紙true鏄惁绾ц仈瀵瑰簲娴佺▼瀹炰緥锛屾縺娲讳簡鍒欏搴旀祦绋嬪疄渚嬮兘鍙互瀹℃壒锛夛紝
//鍙傛暟3锛氫粈涔堟椂鍊欐縺娲伙紝濡傛灉涓簄ull鍒欑珛鍗虫縺娲伙紝濡傛灉涓哄叿浣撴椂闂村垯鍒拌揪姝ゆ椂闂村悗婵�娲�
@@ -217,7 +242,7 @@
*/
@Override
- public boolean migrationProcessDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId) {
+ public boolean migrationDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId) {
try {
// 杩佺Щ楠岃瘉
boolean migrationValid = processMigrationService.createProcessInstanceMigrationBuilder()
@@ -244,10 +269,11 @@
*/
@Override
public boolean convertToModel(String processDefinitionId) {
- ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
+ ProcessDefinition pd = QueryUtils.definitionQuery()
.processDefinitionId(processDefinitionId).singleResult();
InputStream inputStream = repositoryService.getResourceAsStream(pd.getDeploymentId(), pd.getResourceName());
- Model model = repositoryService.createModelQuery().modelKey(pd.getKey()).modelTenantId(TenantHelper.getTenantId()).singleResult();
+ ModelQuery query = QueryUtils.modelQuery();
+ Model model = query.modelKey(pd.getKey()).singleResult();
try {
if (ObjectUtil.isNotNull(model)) {
repositoryService.addModelEditorSource(model.getId(), IoUtil.readBytes(inputStream));
@@ -272,57 +298,101 @@
* @param file 鏂囦欢
* @param categoryCode 鍒嗙被
*/
+ @SneakyThrows
@Override
- public boolean deployByFile(MultipartFile file, String categoryCode) {
- try {
- WfCategory wfCategory = wfCategoryService.queryByCategoryCode(categoryCode);
- if (wfCategory == null) {
- throw new ServiceException("娴佺▼鍒嗙被涓嶅瓨鍦�");
- }
- // 鏂囦欢鍚� = 娴佺▼鍚嶇О-娴佺▼key
- String filename = file.getOriginalFilename();
- assert filename != null;
- String[] splitFilename = filename.substring(0, filename.lastIndexOf(".")).split("-");
- if (splitFilename.length < 2) {
- throw new ServiceException("娴佺▼鍒嗙被涓嶈兘涓虹┖(鏂囦欢鍚� = 娴佺▼鍚嶇О-娴佺▼key)");
- }
- //娴佺▼鍚嶇О
- String processName = splitFilename[0];
- //娴佺▼key
- String processKey = splitFilename[1];
- // 鏂囦欢鍚庣紑鍚�
- String suffix = filename.substring(filename.lastIndexOf(".") + 1).toUpperCase();
- InputStream inputStream = file.getInputStream();
- Deployment deployment;
- if (FlowConstant.ZIP.equals(suffix)) {
- deployment = repositoryService.createDeployment()
- .tenantId(TenantHelper.getTenantId())
- .addZipInputStream(new ZipInputStream(inputStream)).name(processName).key(processKey).category(categoryCode).deploy();
- } else {
- String[] list = ResourceNameUtil.BPMN_RESOURCE_SUFFIXES;
- boolean flag = false;
- for (String str : list) {
- if (filename.contains(str)) {
- flag = true;
- break;
- }
- }
- if (flag) {
- deployment = repositoryService.createDeployment()
- .tenantId(TenantHelper.getTenantId())
- .addInputStream(filename, inputStream).name(processName).key(processKey).category(categoryCode).deploy();
- } else {
- throw new ServiceException("鏂囦欢绫诲瀷涓婁紶閿欒锛�");
- }
- }
- // 鏇存柊鍒嗙被
- ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).singleResult();
- repositoryService.setProcessDefinitionCategory(definition.getId(), categoryCode);
+ @Transactional(rollbackFor = Exception.class)
+ public void deployByFile(MultipartFile file, String categoryCode) {
- return true;
- } catch (IOException e) {
- e.printStackTrace();
- throw new ServiceException("閮ㄧ讲澶辫触" + e.getMessage());
+ WfCategory wfCategory = wfCategoryService.queryByCategoryCode(categoryCode);
+ if (wfCategory == null) {
+ throw new ServiceException("娴佺▼鍒嗙被涓嶅瓨鍦�");
+ }
+ // 鏂囦欢鍚庣紑鍚�
+ String suffix = FileUtil.extName(file.getOriginalFilename());
+ InputStream inputStream = file.getInputStream();
+ if (FlowConstant.ZIP.equalsIgnoreCase(suffix)) {
+ ZipInputStream zipInputStream = null;
+ try {
+ zipInputStream = new ZipInputStream(inputStream);
+ ZipEntry zipEntry;
+ while ((zipEntry = zipInputStream.getNextEntry()) != null) {
+ String filename = zipEntry.getName();
+ String[] splitFilename = filename.substring(0, filename.lastIndexOf(".")).split("-");
+ //娴佺▼鍚嶇О
+ String processName = splitFilename[0];
+ //娴佺▼key
+ String processKey = splitFilename[1];
+ 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);
+ zipInputStream.closeEntry();
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (zipInputStream != null) {
+ zipInputStream.close();
+ }
+ }
+ } else {
+ String originalFilename = file.getOriginalFilename();
+ String bpmnResourceSuffix = ResourceNameUtil.BPMN_RESOURCE_SUFFIXES[0];
+ if (originalFilename.contains(bpmnResourceSuffix)) {
+ // 鏂囦欢鍚� = 娴佺▼鍚嶇О-娴佺▼key
+ String[] splitFilename = originalFilename.substring(0, originalFilename.lastIndexOf(".")).split("-");
+ if (splitFilename.length < 2) {
+ throw new ServiceException("鏂囦欢鍚� = 娴佺▼鍚嶇О-娴佺▼KEY");
+ }
+ //娴佺▼鍚嶇О
+ String processName = splitFilename[0];
+ //娴佺▼key
+ String processKey = splitFilename[1];
+
+ DeploymentBuilder builder = repositoryService.createDeployment();
+ Deployment deployment = builder.addInputStream(originalFilename, inputStream)
+ .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);
+
+ } else {
+ throw new ServiceException("鏂囦欢绫诲瀷涓婁紶閿欒锛�");
+ }
+ }
+
+ }
+
+ /**
+ * 璁剧疆琛ㄥ崟鍐呭
+ *
+ * @param definition 閮ㄧ讲鍚庢渶鏂版祦绋嬪畾涔�
+ */
+ private void setWfNodeConfig(ProcessDefinition definition) {
+ //鏇存柊娴佺▼鑺傜偣閰嶇疆琛ㄥ崟
+ 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)) {
+ WfNodeConfig wfNodeConfig = new WfNodeConfig();
+ wfNodeConfig.setNodeId(userTask.getId());
+ wfNodeConfig.setNodeName(userTask.getName());
+ wfNodeConfig.setDefinitionId(definition.getId());
+ 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);
+ }
+ }
+ if (CollUtil.isNotEmpty(wfNodeConfigList)) {
+ iWfNodeConfigService.saveOrUpdate(wfNodeConfigList);
}
}
}
--
Gitblit v1.9.3