update 修改流程部署时更新流程定义配置
This commit is contained in:
gssong
parent
654b84f4f2
commit
6ad126cf64
@ -6,7 +6,6 @@ import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.core.util.ZipUtil;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.excel.util.StringUtils;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
@ -22,8 +21,11 @@ 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;
|
||||
@ -44,6 +46,8 @@ import java.io.InputStream;
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.zip.ZipEntry;
|
||||
@ -60,6 +64,7 @@ public class ActModelServiceImpl implements IActModelService {
|
||||
|
||||
private final RepositoryService repositoryService;
|
||||
private final IWfNodeConfigService iWfNodeConfigService;
|
||||
private final IWfDefinitionConfigService iWfDefinitionConfigService;
|
||||
|
||||
/**
|
||||
* 分页查询模型
|
||||
@ -260,6 +265,7 @@ public class ActModelServiceImpl implements IActModelService {
|
||||
}
|
||||
// 查询模型的基本信息
|
||||
Model model = repositoryService.getModel(id);
|
||||
ProcessDefinition processDefinition = QueryUtils.definitionQuery().processDefinitionKey(model.getKey()).latestVersion().singleResult();
|
||||
// xml资源的名称 ，对应act_ge_bytearray表中的name_字段
|
||||
String processName = model.getName() + ".bpmn20.xml";
|
||||
// 调用部署相关的api方法进行部署流程定义
|
||||
@ -282,6 +288,20 @@ public class ActModelServiceImpl implements IActModelService {
|
||||
// 更新分类
|
||||
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) {
|
||||
iWfDefinitionConfigService.deleteByDefIds(Collections.singletonList(processDefinition.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);
|
||||
}
|
||||
}
|
||||
//更新流程节点配置表单
|
||||
List<UserTask> userTasks = ModelUtils.getUserTaskFlowElements(definition.getId());
|
||||
UserTask applyUserTask = ModelUtils.getApplyUserTask(definition.getId());
|
||||
|
||||
@ -21,6 +21,7 @@ import org.dromara.workflow.common.constant.FlowConstant;
|
||||
import org.dromara.workflow.domain.WfCategory;
|
||||
import org.dromara.workflow.domain.WfNodeConfig;
|
||||
import org.dromara.workflow.domain.bo.ProcessDefinitionBo;
|
||||
import org.dromara.workflow.domain.bo.WfDefinitionConfigBo;
|
||||
import org.dromara.workflow.domain.vo.ProcessDefinitionVo;
|
||||
import org.dromara.workflow.domain.vo.WfDefinitionConfigVo;
|
||||
import org.dromara.workflow.service.IActProcessDefinitionService;
|
||||
@ -322,13 +323,14 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
|
||||
String processName = splitFilename[0];
|
||||
//流程key
|
||||
String processKey = splitFilename[1];
|
||||
ProcessDefinition oldProcessDefinition = QueryUtils.definitionQuery().processDefinitionKey(processKey).latestVersion().singleResult();
|
||||
DeploymentBuilder builder = repositoryService.createDeployment();
|
||||
Deployment deployment = builder.addInputStream(filename, zipInputStream)
|
||||
.tenantId(TenantHelper.getTenantId())
|
||||
.name(processName).key(processKey).category(categoryCode).deploy();
|
||||
ProcessDefinition definition = QueryUtils.definitionQuery().deploymentId(deployment.getId()).singleResult();
|
||||
repositoryService.setProcessDefinitionCategory(definition.getId(), categoryCode);
|
||||
setWfNodeConfig(definition);
|
||||
setWfConfig(oldProcessDefinition, definition);
|
||||
zipInputStream.closeEntry();
|
||||
}
|
||||
} catch (IOException e) {
|
||||
@ -351,7 +353,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
|
||||
String processName = splitFilename[0];
|
||||
//流程key
|
||||
String processKey = splitFilename[1];
|
||||
|
||||
ProcessDefinition oldProcessDefinition = QueryUtils.definitionQuery().processDefinitionKey(processKey).latestVersion().singleResult();
|
||||
DeploymentBuilder builder = repositoryService.createDeployment();
|
||||
Deployment deployment = builder.addInputStream(originalFilename, inputStream)
|
||||
.tenantId(TenantHelper.getTenantId())
|
||||
@ -359,8 +361,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
|
||||
// 更新分类
|
||||
ProcessDefinition definition = QueryUtils.definitionQuery().deploymentId(deployment.getId()).singleResult();
|
||||
repositoryService.setProcessDefinitionCategory(definition.getId(), categoryCode);
|
||||
setWfNodeConfig(definition);
|
||||
|
||||
setWfConfig(oldProcessDefinition, definition);
|
||||
} else {
|
||||
throw new ServiceException("文件类型上传错误！");
|
||||
}
|
||||
@ -371,9 +372,24 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
|
||||
/**
|
||||
* 设置表单内容
|
||||
*
|
||||
* @param oldProcessDefinition 部署前最新流程定义
|
||||
* @param definition 部署后最新流程定义
|
||||
*/
|
||||
private void setWfNodeConfig(ProcessDefinition definition) {
|
||||
private void setWfConfig(ProcessDefinition oldProcessDefinition, ProcessDefinition definition) {
|
||||
//更新流程定义表单
|
||||
if (oldProcessDefinition != null) {
|
||||
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);
|
||||
}
|
||||
}
|
||||
//更新流程节点配置表单
|
||||
List<UserTask> userTasks = ModelUtils.getUserTaskFlowElements(definition.getId());
|
||||
UserTask applyUserTask = ModelUtils.getApplyUserTask(definition.getId());
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user