From cbc1030043989a54c4a5fdd8c28a503f4aff4bc8 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期二, 02 四月 2024 20:52:52 +0800
Subject: [PATCH] add 添加流程版本
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java | 141 ++++++++++++++++++++++++++++-------------------
1 files changed, 84 insertions(+), 57 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..226b88c 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
@@ -7,22 +7,30 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ZipUtil;
import cn.hutool.json.JSONUtil;
+import com.alibaba.excel.util.StringUtils;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.image.PNGTranscoder;
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;
+import org.dromara.workflow.domain.WfNodeConfig;
import org.dromara.workflow.domain.bo.ModelBo;
+import org.dromara.workflow.domain.bo.WfDefinitionConfigBo;
import org.dromara.workflow.domain.vo.ModelVo;
+import org.dromara.workflow.domain.vo.WfDefinitionConfigVo;
import org.dromara.workflow.service.IActModelService;
+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.BpmnModel;
+import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.*;
import org.flowable.validation.ValidationError;
@@ -35,7 +43,8 @@
import java.io.InputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -50,6 +59,8 @@
public class ActModelServiceImpl implements IActModelService {
private final RepositoryService repositoryService;
+ private final IWfDefinitionConfigService iWfDefinitionConfigService;
+ private final IWfNodeConfigService iWfNodeConfigService;
/**
* 鍒嗛〉鏌ヨ妯″瀷
@@ -58,28 +69,28 @@
* @return 杩斿洖鍒嗛〉鍒楄〃
*/
@Override
- public TableDataInfo<Model> page(ModelBo modelBo) {
- ModelQuery query = repositoryService.createModelQuery();
- if (TenantHelper.isEnable()) {
- query.modelTenantId(TenantHelper.getTenantId());
- }
- if (StringUtils.isNotEmpty(modelBo.getName())) {
+ public TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery) {
+ ModelQuery query = QueryUtils.modelQuery();
+ if (StringUtils.isNotBlank(modelBo.getName())) {
query.modelNameLike("%" + modelBo.getName() + "%");
}
- if (StringUtils.isNotEmpty(modelBo.getKey())) {
+ if (StringUtils.isNotBlank(modelBo.getKey())) {
query.modelKey(modelBo.getKey());
}
- if (StringUtils.isNotEmpty(modelBo.getCategoryCode())) {
+ if (StringUtils.isNotBlank(modelBo.getCategoryCode())) {
query.modelCategory(modelBo.getCategoryCode());
}
query.orderByLastUpdateTime().desc();
// 鍒涘缓鏃堕棿闄嶅簭鎺掑垪
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);
+ TableDataInfo<Model> build = TableDataInfo.build();
+ build.setRows(modelList);
+ build.setTotal(total);
+ return build;
}
/**
@@ -98,12 +109,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 +120,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 +168,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 +199,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宸插瓨鍦紒");
});
@@ -265,14 +261,11 @@
}
// 鏌ヨ妯″瀷鐨勫熀鏈俊鎭�
Model model = repositoryService.getModel(id);
+ ProcessDefinition processDefinition = QueryUtils.definitionQuery().processDefinitionKey(model.getKey()).latestVersion().singleResult();
// 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,14 +274,46 @@
.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());
+ //鏇存柊娴佺▼瀹氫箟琛ㄥ崟
+ if (processDefinition != null) {
+ WfDefinitionConfigVo definitionVo = iWfDefinitionConfigService.getByDefId(processDefinition.getId());
+ if (definitionVo != null) {
+ WfDefinitionConfigBo wfFormDefinition = new WfDefinitionConfigBo();
+ wfFormDefinition.setDefinitionId(definition.getId());
+ wfFormDefinition.setProcessKey(definition.getKey());
+ wfFormDefinition.setFormId(ObjectUtil.isNotNull(definitionVo.getFormId()) ? definitionVo.getFormId() : null);
+ wfFormDefinition.setRemark(definitionVo.getRemark());
+ iWfDefinitionConfigService.saveOrUpdate(wfFormDefinition);
+ }
+ }
+ //鏇存柊娴佺▼鑺傜偣閰嶇疆琛ㄥ崟
+ List<UserTask> userTasks = ModelUtils.getuserTaskFlowElements(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]));
+ wfNodeConfigList.add(wfNodeConfig);
+ }
+ }
+ if (CollUtil.isNotEmpty(wfNodeConfigList)) {
+ iWfNodeConfigService.saveOrUpdate(wfNodeConfigList);
+ }
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -299,35 +324,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