From 5360ec6ec3bf356a554df624e884a0bb1090fa4b Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期日, 17 三月 2024 18:25:20 +0800
Subject: [PATCH] add 添加节点审批记录，调整流程驳回
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 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 01bb12e..595c993 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
@@ -15,6 +15,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.dromara.common.core.exception.ServiceException;
+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;
@@ -22,12 +23,10 @@
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.Deployment;
-import org.flowable.engine.repository.Model;
-import org.flowable.engine.repository.ModelQuery;
-import org.flowable.engine.repository.ProcessDefinition;
+import org.flowable.engine.repository.*;
import org.flowable.validation.ValidationError;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -38,7 +37,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;
@@ -61,9 +60,8 @@
* @return 杩斿洖鍒嗛〉鍒楄〃
*/
@Override
- public TableDataInfo<Model> page(ModelBo modelBo) {
- ModelQuery query = repositoryService.createModelQuery();
- query.modelTenantId(TenantHelper.getTenantId());
+ public TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery) {
+ ModelQuery query = QueryUtils.modelQuery();
if (StringUtils.isNotEmpty(modelBo.getName())) {
query.modelNameLike("%" + modelBo.getName() + "%");
}
@@ -77,7 +75,7 @@
// 鍒涘缓鏃堕棿闄嶅簭鎺掑垪
query.orderByCreateTime().desc();
// 鍒嗛〉鏌ヨ
- List<Model> modelList = query.listPage(modelBo.getPageNum(), modelBo.getPageSize());
+ List<Model> modelList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
// 鎬昏褰曟暟
long total = query.count();
return new TableDataInfo<>(modelList, total);
@@ -99,7 +97,7 @@
String description = modelBo.getDescription();
String categoryCode = modelBo.getCategoryCode();
String xml = modelBo.getXml();
- Model checkModel = repositoryService.createModelQuery().modelKey(key).modelTenantId(TenantHelper.getTenantId()).singleResult();
+ Model checkModel = QueryUtils.modelQuery().modelKey(key).singleResult();
if (ObjectUtil.isNotNull(checkModel)) {
throw new ServiceException("妯″瀷key宸插瓨鍦紒");
}
@@ -158,7 +156,7 @@
public boolean update(ModelBo modelBo) {
try {
Model model = repositoryService.getModel(modelBo.getId());
- List<Model> list = repositoryService.createModelQuery().modelTenantId(TenantHelper.getTenantId()).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宸插瓨鍦紒");
});
@@ -189,7 +187,7 @@
BpmnModel bpmnModel = ModelUtils.xmlToBpmnModel(xml);
ModelUtils.checkBpmnModel(bpmnModel);
Model model = repositoryService.getModel(modelId);
- List<Model> list = repositoryService.createModelQuery().modelTenantId(TenantHelper.getTenantId()).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宸插瓨鍦紒");
});
@@ -271,7 +269,7 @@
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) {
@@ -283,35 +281,37 @@
/**
* 瀵煎嚭妯″瀷zip鍘嬬缉鍖�
*
- * @param modelId 妯″瀷id
+ * @param modelIds 妯″瀷id
* @param response 鐩稿簲
*/
@Override
- public void exportZip(String modelId, HttpServletResponse response) {
+ public void exportZip(List<String> modelIds, HttpServletResponse response) {
ZipOutputStream zos = null;
try {
zos = ZipUtil.getZipOutputStream(response.getOutputStream(), StandardCharsets.UTF_8);
// 鍘嬬缉鍖呮枃浠跺悕
String zipName = "妯″瀷涓嶅瓨鍦�";
// 鏌ヨ妯″瀷鍩烘湰淇℃伅
- Model model = repositoryService.getModel(modelId);
- byte[] xmlBytes = repositoryService.getModelEditorSource(modelId);
- if (ObjectUtil.isNotNull(model)) {
- if (JSONUtil.isTypeJSON(IOUtils.toString(xmlBytes, StandardCharsets.UTF_8.toString())) && ArrayUtil.isEmpty(ModelUtils.bpmnJsonToXmlBytes(xmlBytes))) {
- zipName = "妯″瀷涓嶈兘涓虹┖锛岃鑷冲皯璁捐涓�鏉′富绾挎祦绋嬶紒";
- zos.putNextEntry(new ZipEntry(zipName + ".txt"));
- zos.write(zipName.getBytes(StandardCharsets.UTF_8));
- } else if (ArrayUtil.isEmpty(xmlBytes)) {
- zipName = "妯″瀷鏁版嵁涓虹┖锛岃鍏堣璁℃祦绋嬪畾涔夋ā鍨嬶紝鍐嶈繘琛岄儴缃诧紒";
- zos.putNextEntry(new ZipEntry(zipName + ".txt"));
- zos.write(zipName.getBytes(StandardCharsets.UTF_8));
- } else {
- String fileName = model.getName() + "-" + model.getKey();
- // 鍘嬬缉鍖呮枃浠跺悕
- zipName = fileName + ".zip";
- // 灏唜ml娣诲姞鍒板帇缂╁寘涓�(鎸囧畾xml鏂囦欢鍚嶏細璇峰亣娴佺▼.bpmn20.xml
- zos.putNextEntry(new ZipEntry(fileName + ".bpmn20.xml"));
- zos.write(xmlBytes);
+ for (String modelId : modelIds) {
+ Model model = repositoryService.getModel(modelId);
+ byte[] xmlBytes = repositoryService.getModelEditorSource(modelId);
+ if (ObjectUtil.isNotNull(model)) {
+ if (JSONUtil.isTypeJSON(IOUtils.toString(xmlBytes, StandardCharsets.UTF_8.toString())) && ArrayUtil.isEmpty(ModelUtils.bpmnJsonToXmlBytes(xmlBytes))) {
+ zipName = "妯″瀷涓嶈兘涓虹┖锛岃鑷冲皯璁捐涓�鏉′富绾挎祦绋嬶紒";
+ zos.putNextEntry(new ZipEntry(zipName + ".txt"));
+ zos.write(zipName.getBytes(StandardCharsets.UTF_8));
+ } else if (ArrayUtil.isEmpty(xmlBytes)) {
+ zipName = "妯″瀷鏁版嵁涓虹┖锛岃鍏堣璁℃祦绋嬪畾涔夋ā鍨嬶紝鍐嶈繘琛岄儴缃诧紒";
+ zos.putNextEntry(new ZipEntry(zipName + ".txt"));
+ zos.write(zipName.getBytes(StandardCharsets.UTF_8));
+ } else {
+ String fileName = model.getName() + "-" + model.getKey();
+ // 鍘嬬缉鍖呮枃浠跺悕
+ zipName = fileName + ".zip";
+ // 灏唜ml娣诲姞鍒板帇缂╁寘涓�(鎸囧畾xml鏂囦欢鍚嶏細璇峰亣娴佺▼.bpmn20.xml
+ zos.putNextEntry(new ZipEntry(fileName + ".bpmn20.xml"));
+ zos.write(xmlBytes);
+ }
}
}
response.setHeader("Content-Disposition",
--
Gitblit v1.9.3