From acc7f3dfe57c064e27adaeecc28644197e374f66 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 06 三月 2024 23:56:43 +0800
Subject: [PATCH] update 优化 封装 QueryUtils 查询工具 简化工作流业务查询代码
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
index b2a7892..4d23bf0 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
@@ -22,6 +22,7 @@
import org.dromara.workflow.domain.vo.ModelVo;
import org.dromara.workflow.service.IActModelService;
import org.dromara.workflow.utils.ModelUtils;
+import org.dromara.workflow.utils.QueryUtils;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.*;
@@ -35,7 +36,7 @@
import java.io.InputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.List;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -59,10 +60,7 @@
*/
@Override
public TableDataInfo<Model> page(ModelBo modelBo) {
- ModelQuery query = repositoryService.createModelQuery();
- if (TenantHelper.isEnable()) {
- query.modelTenantId(TenantHelper.getTenantId());
- }
+ ModelQuery query = QueryUtils.modelQuery();
if (StringUtils.isNotEmpty(modelBo.getName())) {
query.modelNameLike("%" + modelBo.getName() + "%");
}
@@ -98,12 +96,7 @@
String description = modelBo.getDescription();
String categoryCode = modelBo.getCategoryCode();
String xml = modelBo.getXml();
- ModelQuery query = repositoryService.createModelQuery();
- query.modelKey(key);
- if (TenantHelper.isEnable()) {
- query.modelTenantId(TenantHelper.getTenantId());
- }
- Model checkModel = query.singleResult();
+ Model checkModel = QueryUtils.modelQuery().modelKey(key).singleResult();
if (ObjectUtil.isNotNull(checkModel)) {
throw new ServiceException("妯″瀷key宸插瓨鍦紒");
}
@@ -114,9 +107,7 @@
model.setVersion(version);
model.setCategory(categoryCode);
model.setMetaInfo(description);
- if (TenantHelper.isEnable()) {
- model.setTenantId(TenantHelper.getTenantId());
- }
+ model.setTenantId(TenantHelper.getTenantId());
//淇濆瓨鍒濆鍖栫殑妯″瀷鍩烘湰淇℃伅鏁版嵁
repositoryService.saveModel(model);
repositoryService.addModelEditorSource(model.getId(), StrUtil.utf8Bytes(xml));
@@ -164,11 +155,7 @@
public boolean update(ModelBo modelBo) {
try {
Model model = repositoryService.getModel(modelBo.getId());
- ModelQuery query = repositoryService.createModelQuery();
- if (TenantHelper.isEnable()) {
- query.modelTenantId(TenantHelper.getTenantId());
- }
- List<Model> list = query.modelKey(modelBo.getKey()).list();
+ List<Model> list = QueryUtils.modelQuery().modelKey(modelBo.getKey()).list();
list.stream().filter(e -> !e.getId().equals(model.getId())).findFirst().ifPresent(e -> {
throw new ServiceException("妯″瀷KEY宸插瓨鍦紒");
});
@@ -199,11 +186,7 @@
BpmnModel bpmnModel = ModelUtils.xmlToBpmnModel(xml);
ModelUtils.checkBpmnModel(bpmnModel);
Model model = repositoryService.getModel(modelId);
- ModelQuery query = repositoryService.createModelQuery();
- if (TenantHelper.isEnable()) {
- query.modelTenantId(TenantHelper.getTenantId());
- }
- List<Model> list = query.modelKey(key).list();
+ List<Model> list = QueryUtils.modelQuery().modelKey(key).list();
list.stream().filter(e -> !e.getId().equals(model.getId())).findFirst().ifPresent(e -> {
throw new ServiceException("妯″瀷KEY宸插瓨鍦紒");
});
@@ -268,11 +251,7 @@
// xml璧勬簮鐨勫悕绉� 锛屽搴攁ct_ge_bytearray琛ㄤ腑鐨刵ame_瀛楁
String processName = model.getName() + ".bpmn20.xml";
// 璋冪敤閮ㄧ讲鐩稿叧鐨刟pi鏂规硶杩涜閮ㄧ讲娴佺▼瀹氫箟
- DeploymentBuilder builder = repositoryService.createDeployment();
- if (TenantHelper.isEnable()) {
- builder.tenantId(TenantHelper.getTenantId());
- }
- Deployment deployment = builder
+ Deployment deployment = repositoryService.createDeployment()
// 閮ㄧ讲鍚嶇О
.name(model.getName())
// 閮ㄧ讲鏍囪瘑key
@@ -281,13 +260,15 @@
.category(model.getCategory())
// bpmn20.xml璧勬簮
.addBytes(processName, xmlBytes)
+ // 绉熸埛id
+ .tenantId(TenantHelper.getTenantId())
.deploy();
// 鏇存柊 閮ㄧ讲id 鍒版祦绋嬪畾涔夋ā鍨嬫暟鎹〃涓�
model.setDeploymentId(deployment.getId());
repositoryService.saveModel(model);
// 鏇存柊鍒嗙被
- ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).singleResult();
+ ProcessDefinition definition = QueryUtils.definitionQuery().deploymentId(deployment.getId()).singleResult();
repositoryService.setProcessDefinitionCategory(definition.getId(), model.getCategory());
return true;
} catch (Exception e) {
--
Gitblit v1.9.3