From 9969b576f1bccdd1dbb1550190bfdda3d4f37eb4 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Sun, 30 Mar 2025 09:36:41 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E4=BC=98=E5=8C=96=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=94=9F=E6=88=90=E8=A7=A6=E5=8F=91=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B5=81=E7=A8=8Bcode=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/workflow/api/RemoteWorkflowService.java | 2 +- .../workflow/dubbo/RemoteWorkflowServiceImpl.java | 7 +++++-- .../dromara/workflow/mapper/FlwCategoryMapper.java | 2 ++ .../workflow/service/IFlwDefinitionService.java | 3 +++ .../dromara/workflow/service/IFlwTaskService.java | 6 ------ .../service/impl/FlwDefinitionServiceImpl.java | 12 +++++------- .../workflow/service/impl/FlwTaskServiceImpl.java | 8 -------- .../resources/mapper/workflow/FlwCategoryMapper.xml | 4 ++++ 8 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java b/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java index e685f11..0efe75e 100644 --- a/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java +++ b/dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java @@ -126,6 +126,6 @@ public interface RemoteWorkflowService { */ List currentTaskAllUser(Long taskId); - FlowLabelVo getFlowLabel(String labelId); + String getFlowCode(String postCode); } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java index 958a512..9ecd7b0 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java @@ -8,6 +8,7 @@ import org.dromara.workflow.api.domain.FlowLabelVo; import org.dromara.workflow.api.domain.RemoteCompleteTask; import org.dromara.workflow.api.domain.RemoteStartProcess; import org.dromara.workflow.api.domain.RemoteStartProcessReturn; +import org.dromara.workflow.service.IFlwDefinitionService; import org.dromara.workflow.service.IFlwTaskService; import org.dromara.workflow.service.WorkflowService; import org.springframework.stereotype.Service; @@ -32,6 +33,8 @@ public class RemoteWorkflowServiceImpl implements RemoteWorkflowService { private final IFlwTaskService flwTaskService; + private final IFlwDefinitionService flwDefinitionService; + private static final ExecutorService executor = Executors.newFixedThreadPool(10); @Override @@ -100,8 +103,8 @@ public class RemoteWorkflowServiceImpl implements RemoteWorkflowService { } @Override - public FlowLabelVo getFlowLabel(String labelId) { - return flwTaskService.getFlowLabel(labelId); + public String getFlowCode(String postCode){ + return flwDefinitionService.getFlowCode(postCode); } @Override diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java index d2c0b3a..d48d4cb 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java @@ -1,6 +1,7 @@ package org.dromara.workflow.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -57,4 +58,5 @@ public interface FlwCategoryMapper extends BaseMapperPlus getByNodeCodes(String nodeCode,Long definitionId); - /** - * 根据部门获取流程 - * @param labelId - * @return - */ - FlowLabelVo getFlowLabel(String labelId); } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index 96ff9a7..9af6154 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -67,7 +67,6 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { private final FlowNodeMapper flowNodeMapper; private final FlowSkipMapper flowSkipMapper; private final FlwCategoryMapper flwCategoryMapper; - private final FlwLabelService flwDepartService; /** * 查询流程定义列表 @@ -84,12 +83,6 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { TableDataInfo build = TableDataInfo.build(); build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class)); build.setTotal(page.getTotal()); - build.getRows().forEach(p ->{ - FlowLabel info = flwDepartService.getInfo(p.getFlowCode()); - if(ObjectUtil.isNotEmpty(info)){ - p.setLabelIds(info.getLabelIds()); - } - }); return build; } @@ -278,4 +271,9 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { } } } + + @Override + public String getFlowCode(String postCode) { + return flwCategoryMapper.getFlowCode(postCode); + } } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 8c6719e..deaedb7 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -321,14 +321,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService { return nodeService.getByNodeCodes(Collections.singletonList(nodeCode), definitionId); } - @Override - public FlowLabelVo getFlowLabel(String labelId) { - FlowLabel flowDepart = flwDepartService.getFlowLabel(labelId); - FlowLabelVo flowDepartVo = new FlowLabelVo(); - BeanUtils.copyProperties(flowDepart, flowDepartVo); - - return flowDepartVo; - } /** * 查询当前用户的已办任务 diff --git a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml index e9918f1..95ae1de 100644 --- a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml +++ b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml @@ -8,4 +8,8 @@ select count(*) from flow_category where del_flag = '0' and category_id = #{categoryId} + +