From 234d8989d7b65aee665b5932fcf182009753592b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 06 三月 2024 19:07:23 +0800
Subject: [PATCH] update 优化 支持工作流关闭租户
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 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..f29db1d 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
@@ -24,10 +24,7 @@
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.web.multipart.MultipartFile;
@@ -66,7 +63,9 @@
@Override
public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo) {
ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
- query.processDefinitionTenantId(TenantHelper.getTenantId());
+ if (TenantHelper.isEnable()) {
+ query.processDefinitionTenantId(TenantHelper.getTenantId());
+ }
if (StringUtils.isNotEmpty(processDefinitionBo.getKey())) {
query.processDefinitionKey(processDefinitionBo.getKey());
}
@@ -110,7 +109,10 @@
public List<ProcessDefinitionVo> getProcessDefinitionListByKey(String key) {
List<ProcessDefinitionVo> processDefinitionVoList = new ArrayList<>();
ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
- List<ProcessDefinition> definitionList = query.processDefinitionTenantId(TenantHelper.getTenantId()).processDefinitionKey(key).list();
+ if (TenantHelper.isEnable()) {
+ query.processDefinitionTenantId(TenantHelper.getTenantId());
+ }
+ 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());
@@ -192,8 +194,11 @@
@Override
public boolean updateProcessDefState(String processDefinitionId) {
try {
- ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
- .processDefinitionId(processDefinitionId).processDefinitionTenantId(TenantHelper.getTenantId()).singleResult();
+ ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
+ if (TenantHelper.isEnable()) {
+ query.processDefinitionTenantId(TenantHelper.getTenantId());
+ }
+ ProcessDefinition processDefinition = query.processDefinitionId(processDefinitionId).singleResult();
//灏嗗綋鍓嶄负鎸傝捣鐘舵�佹洿鏂颁负婵�娲荤姸鎬�
//鍙傛暟璇存槑锛氬弬鏁�1锛氭祦绋嬪畾涔塱d,鍙傛暟2锛氭槸鍚︽縺娲伙紙true鏄惁绾ц仈瀵瑰簲娴佺▼瀹炰緥锛屾縺娲讳簡鍒欏搴旀祦绋嬪疄渚嬮兘鍙互瀹℃壒锛夛紝
//鍙傛暟3锛氫粈涔堟椂鍊欐縺娲伙紝濡傛灉涓簄ull鍒欑珛鍗虫縺娲伙紝濡傛灉涓哄叿浣撴椂闂村垯鍒拌揪姝ゆ椂闂村悗婵�娲�
@@ -247,7 +252,11 @@
ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
.processDefinitionId(processDefinitionId).singleResult();
InputStream inputStream = repositoryService.getResourceAsStream(pd.getDeploymentId(), pd.getResourceName());
- Model model = repositoryService.createModelQuery().modelKey(pd.getKey()).modelTenantId(TenantHelper.getTenantId()).singleResult();
+ ModelQuery query = repositoryService.createModelQuery();
+ if (TenantHelper.isEnable()) {
+ query.modelTenantId(TenantHelper.getTenantId());
+ }
+ Model model = query.modelKey(pd.getKey()).singleResult();
try {
if (ObjectUtil.isNotNull(model)) {
repositoryService.addModelEditorSource(model.getId(), IoUtil.readBytes(inputStream));
@@ -295,9 +304,12 @@
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();
+ DeploymentBuilder query = repositoryService.createDeployment();
+ if (TenantHelper.isEnable()) {
+ query.tenantId(TenantHelper.getTenantId());
+ }
+ deployment = query.addZipInputStream(new ZipInputStream(inputStream))
+ .name(processName).key(processKey).category(categoryCode).deploy();
} else {
String[] list = ResourceNameUtil.BPMN_RESOURCE_SUFFIXES;
boolean flag = false;
@@ -308,9 +320,12 @@
}
}
if (flag) {
- deployment = repositoryService.createDeployment()
- .tenantId(TenantHelper.getTenantId())
- .addInputStream(filename, inputStream).name(processName).key(processKey).category(categoryCode).deploy();
+ DeploymentBuilder query = repositoryService.createDeployment();
+ if (TenantHelper.isEnable()) {
+ query.tenantId(TenantHelper.getTenantId());
+ }
+ deployment = query.addInputStream(filename, inputStream)
+ .name(processName).key(processKey).category(categoryCode).deploy();
} else {
throw new ServiceException("鏂囦欢绫诲瀷涓婁紶閿欒锛�");
}
--
Gitblit v1.9.3