From e98532e03484aa9f8ed1695d592248e53cdbb2dd Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Wed, 7 Jun 2023 22:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=A7=9F=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/domain/bo/StartProcessBo.java | 1 - .../service/impl/ActModelServiceImpl.java | 16 ++++++++-------- .../impl/ActProcessDefinitionServiceImpl.java | 10 +++++----- .../service/impl/ActTaskServiceImpl.java | 6 +++--- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java index 375fc2704..c9a068c33 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java @@ -32,7 +32,6 @@ public class StartProcessBo implements Serializable { private String processKey; /** - * 如果传实体 需要序列化后的 * 流程变量，前端会提交一个元素{'entity': {业务详情数据对象}} */ private Map variables; 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 d57fd2c3f..391f433e4 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 @@ -16,7 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.workflow.domain.bo.ModelBo; import org.dromara.workflow.service.IActModelService; import org.dromara.workflow.utils.WorkflowUtils; @@ -64,7 +64,7 @@ public class ActModelServiceImpl implements IActModelService { @Override public TableDataInfo getByPage(ModelBo modelBo) { ModelQuery query = repositoryService.createModelQuery(); - query.modelTenantId(LoginHelper.getTenantId()); + query.modelTenantId(TenantHelper.getTenantId()); if (StringUtils.isNotEmpty(modelBo.getName())) { query.modelNameLike("%" + modelBo.getName() + "%"); } @@ -105,7 +105,7 @@ public class ActModelServiceImpl implements IActModelService { String key = modelBo.getKey(); String name = modelBo.getName(); String description = modelBo.getDescription(); - Model checkModel = repositoryService.createModelQuery().modelKey(key).modelTenantId(LoginHelper.getTenantId()).singleResult(); + Model checkModel = repositoryService.createModelQuery().modelKey(key).modelTenantId(TenantHelper.getTenantId()).singleResult(); if (ObjectUtil.isNotNull(checkModel)) { throw new ServiceException("模型key已存在！"); } @@ -114,7 +114,7 @@ public class ActModelServiceImpl implements IActModelService { model.setKey(key); model.setName(name); model.setVersion(version); - model.setTenantId(LoginHelper.getTenantId()); + model.setTenantId(TenantHelper.getTenantId()); ObjectMapper objectMapper = JsonUtils.getObjectMapper(); // 封装模型json对象 ObjectNode objectNode = JsonUtils.getObjectMapper().createObjectNode(); @@ -152,7 +152,7 @@ public class ActModelServiceImpl implements IActModelService { @Override public ObjectNode getModelInfo(String modelId) { ObjectNode modelNode = null; - Model model = repositoryService.createModelQuery().modelId(modelId).modelTenantId(LoginHelper.getTenantId()).singleResult(); + Model model = repositoryService.createModelQuery().modelId(modelId).modelTenantId(TenantHelper.getTenantId()).singleResult(); ObjectMapper objectMapper = JsonUtils.getObjectMapper(); if (model != null) { try { @@ -195,7 +195,7 @@ public class ActModelServiceImpl implements IActModelService { @Transactional(rollbackFor = Exception.class) public boolean editModel(String modelId, MultiValueMap values) { try { - Model model = repositoryService.createModelQuery().modelId(modelId).modelTenantId(LoginHelper.getTenantId()).singleResult(); + Model model = repositoryService.createModelQuery().modelId(modelId).modelTenantId(TenantHelper.getTenantId()).singleResult(); ObjectMapper objectMapper = JsonUtils.getObjectMapper(); ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo()); @@ -208,7 +208,7 @@ public class ActModelServiceImpl implements IActModelService { model.setVersion(model.getVersion() + 1); // 获取唯一标识key String key = values.getFirst("key"); - List list = repositoryService.createModelQuery().modelKey(key).modelTenantId(LoginHelper.getTenantId()).list(); + List list = repositoryService.createModelQuery().modelKey(key).modelTenantId(TenantHelper.getTenantId()).list(); list.stream().filter(e -> !e.getId().equals(model.getId())).findFirst().ifPresent(e -> { throw new ServiceException("模型key已存在！"); }); @@ -270,7 +270,7 @@ public class ActModelServiceImpl implements IActModelService { // bpmn20.xml资源 .addBytes(processName, xmlBytes) // 租户id - .tenantId(LoginHelper.getTenantId()) + .tenantId(TenantHelper.getTenantId()) .deploy(); // 更新 部署id 到流程定义模型数据表中 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 056d4a2c4..7c7266b78 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 @@ -14,7 +14,7 @@ import org.apache.commons.io.IOUtils; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.workflow.domain.bo.ProcessDefinitionBo; import org.dromara.workflow.domain.vo.ProcessDefinitionVo; import org.dromara.workflow.service.IActProcessDefinitionService; @@ -60,7 +60,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer @Override public TableDataInfo getByPage(ProcessDefinitionBo processDefinitionBo) { ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery(); - query.processDefinitionTenantId(LoginHelper.getTenantId()); + query.processDefinitionTenantId(TenantHelper.getTenantId()); if (StringUtils.isNotEmpty(processDefinitionBo.getKey())) { query.processDefinitionKey(processDefinitionBo.getKey()); } @@ -101,7 +101,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer public List getProcessDefinitionListByKey(String key) { List processDefinitionVoList = new ArrayList<>(); ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery(); - List definitionList = query.processDefinitionTenantId(LoginHelper.getTenantId()).processDefinitionKey(key).list(); + List definitionList = query.processDefinitionTenantId(TenantHelper.getTenantId()).processDefinitionKey(key).list(); List deploymentList = null; if (CollUtil.isNotEmpty(definitionList)) { List deploymentIds = definitionList.stream().map(ProcessDefinition::getDeploymentId).collect(Collectors.toList()); @@ -210,7 +210,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer public boolean updateProcessDefState(String processDefinitionId) { try { ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() - .processDefinitionId(processDefinitionId).processDefinitionTenantId(LoginHelper.getTenantId()).singleResult(); + .processDefinitionId(processDefinitionId).processDefinitionTenantId(TenantHelper.getTenantId()).singleResult(); //将当前为挂起状态更新为激活状态 //参数说明：参数1：流程定义id,参数2：是否激活（true是否级联对应流程实例，激活了则对应流程实例都可以审批）， //参数3：什么时候激活，如果为null则立即激活，如果为具体时间则到达此时间后激活 @@ -264,7 +264,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer ProcessDefinition pd = repositoryService.createProcessDefinitionQuery() .processDefinitionId(processDefinitionId).singleResult(); InputStream inputStream = repositoryService.getResourceAsStream(pd.getDeploymentId(), pd.getResourceName()); - Model model = repositoryService.createModelQuery().modelKey(pd.getKey()).modelTenantId(LoginHelper.getTenantId()).singleResult(); + Model model = repositoryService.createModelQuery().modelKey(pd.getKey()).modelTenantId(TenantHelper.getTenantId()).singleResult(); try { if (ObjectUtil.isNotNull(model)) { repositoryService.addModelEditorSource(model.getId(), IoUtil.readBytes(inputStream)); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java index 41cb6497c..7b085832b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java @@ -1,11 +1,11 @@ package org.dromara.workflow.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.workflow.domain.bo.StartProcessBo; import org.dromara.workflow.service.IActTaskService; import org.flowable.common.engine.impl.identity.Authentication; @@ -63,9 +63,9 @@ public class ActTaskServiceImpl implements IActTaskService { variables.put("_FLOWABLE_SKIP_EXPRESSION_ENABLED", true); ProcessInstance pi; if (CollUtil.isNotEmpty(variables)) { - pi = runtimeService.startProcessInstanceByKeyAndTenantId(startProcessBo.getProcessKey(), startProcessBo.getBusinessKey(), variables, LoginHelper.getTenantId()); + pi = runtimeService.startProcessInstanceByKeyAndTenantId(startProcessBo.getProcessKey(), startProcessBo.getBusinessKey(), variables, TenantHelper.getTenantId()); } else { - pi = runtimeService.startProcessInstanceByKeyAndTenantId(startProcessBo.getProcessKey(), startProcessBo.getBusinessKey(), LoginHelper.getTenantId()); + pi = runtimeService.startProcessInstanceByKeyAndTenantId(startProcessBo.getProcessKey(), startProcessBo.getBusinessKey(), TenantHelper.getTenantId()); } // 将流程定义名称 作为 流程实例名称 runtimeService.setProcessInstanceName(pi.getProcessInstanceId(), pi.getProcessDefinitionName());