From 31d445c6a14edfe4f74cd60dcb6f8d84a50aaca1 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期一, 06 五月 2024 22:18:14 +0800
Subject: [PATCH] update 调整用户id翻译，优化审批记录待审批候选人显示问题
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 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 468e397..bbdc4bf 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
@@ -3,14 +3,12 @@
import cn.hutool.core.bean.BeanUtil;
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;
@@ -38,7 +36,6 @@
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.impl.bpmn.deployer.ResourceNameUtil;
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;
@@ -46,7 +43,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -150,7 +150,7 @@
processDefinitionVoList.add(processDefinitionVo);
}
}
- return CollectionUtil.reverse(processDefinitionVoList);
+ return CollUtil.reverse(processDefinitionVoList);
}
/**
@@ -162,7 +162,7 @@
@Override
public String definitionImage(String processDefinitionId) {
InputStream inputStream = repositoryService.getProcessDiagram(processDefinitionId);
- return Base64.encode(IOUtils.toByteArray(inputStream));
+ return Base64.encode(IoUtil.readBytes(inputStream));
}
/**
@@ -174,13 +174,8 @@
public String definitionXml(String processDefinitionId) {
StringBuilder xml = new StringBuilder();
ProcessDefinition processDefinition = repositoryService.getProcessDefinition(processDefinitionId);
- InputStream inputStream;
- try {
- inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName());
- xml.append(IOUtils.toString(inputStream, StandardCharsets.UTF_8));
- } catch (IOException e) {
- e.printStackTrace();
- }
+ InputStream inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName());
+ xml.append(IoUtil.read(inputStream, StandardCharsets.UTF_8));
return xml.toString();
}
@@ -195,7 +190,7 @@
public boolean deleteDeployment(List<String> deploymentIds, List<String> processDefinitionIds) {
try {
List<HistoricProcessInstance> historicProcessInstances = QueryUtils.hisInstanceQuery().deploymentIdIn(deploymentIds).list();
- if (CollectionUtil.isNotEmpty(historicProcessInstances)) {
+ if (CollUtil.isNotEmpty(historicProcessInstances)) {
Set<String> defIds = StreamUtils.toSet(historicProcessInstances, HistoricProcessInstance::getProcessDefinitionId);
List<ProcessDefinition> processDefinitions = QueryUtils.definitionQuery().processDefinitionIds(defIds).list();
if (CollUtil.isNotEmpty(processDefinitions)) {
@@ -387,12 +382,12 @@
if (CollUtil.isEmpty(wfDefinitionConfigs)) {
ProcessDefinition processDefinition = QueryUtils.definitionQuery().processDefinitionKey("leave1").latestVersion().singleResult();
if (processDefinition != null) {
- WfDefinitionConfigBo wfFormDefinition = new WfDefinitionConfigBo();
- wfFormDefinition.setDefinitionId(processDefinition.getId());
- wfFormDefinition.setProcessKey(processDefinition.getKey());
- wfFormDefinition.setTableName("test_leave");
- wfFormDefinition.setVersion(processDefinition.getVersion());
- iWfDefinitionConfigService.saveOrUpdate(wfFormDefinition);
+ WfDefinitionConfigBo wfDefinitionConfigBo = new WfDefinitionConfigBo();
+ wfDefinitionConfigBo.setDefinitionId(processDefinition.getId());
+ wfDefinitionConfigBo.setProcessKey(processDefinition.getKey());
+ wfDefinitionConfigBo.setTableName("test_leave");
+ wfDefinitionConfigBo.setVersion(processDefinition.getVersion());
+ iWfDefinitionConfigService.saveOrUpdate(wfDefinitionConfigBo);
}
}
@@ -410,13 +405,13 @@
WfDefinitionConfigVo definitionVo = iWfDefinitionConfigService.getByDefId(oldProcessDefinition.getId());
if (definitionVo != null) {
iWfDefinitionConfigService.deleteByDefIds(Collections.singletonList(oldProcessDefinition.getId()));
- WfDefinitionConfigBo wfFormDefinition = new WfDefinitionConfigBo();
- wfFormDefinition.setDefinitionId(definition.getId());
- wfFormDefinition.setProcessKey(definition.getKey());
- wfFormDefinition.setTableName(definitionVo.getTableName());
- wfFormDefinition.setVersion(definition.getVersion());
- wfFormDefinition.setRemark(definitionVo.getRemark());
- iWfDefinitionConfigService.saveOrUpdate(wfFormDefinition);
+ WfDefinitionConfigBo wfDefinitionConfigBo = new WfDefinitionConfigBo();
+ wfDefinitionConfigBo.setDefinitionId(definition.getId());
+ wfDefinitionConfigBo.setProcessKey(definition.getKey());
+ wfDefinitionConfigBo.setTableName(definitionVo.getTableName());
+ wfDefinitionConfigBo.setVersion(definition.getVersion());
+ wfDefinitionConfigBo.setRemark(definitionVo.getRemark());
+ iWfDefinitionConfigService.saveOrUpdate(wfDefinitionConfigBo);
}
}
//鏇存柊娴佺▼鑺傜偣閰嶇疆琛ㄥ崟
--
Gitblit v1.9.3