From 6f0dd8dc8939a6dfd85deb0dc8c818dc3bc0cf01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=89=9B=E5=AD=90Li?= Date: Tue, 14 Jan 2025 05:40:07 +0000 Subject: [PATCH] =?UTF-8?q?!636=20update=20=E4=BC=98=E5=8C=96=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=80=9A=E8=BF=87=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=B7=A5=E4=BD=9C=E6=B5=81=20*=20update=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=85=B3=E9=97=AD=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlwDefinitionController.java | 5 ++- .../controller/FlwInstanceController.java | 5 ++- .../service/impl/FlwCategoryServiceImpl.java | 5 ++- .../impl/FlwDefinitionServiceImpl.java | 17 ++++++--- .../service/impl/FlwInstanceServiceImpl.java | 23 +++++++---- .../service/impl/FlwTaskServiceImpl.java | 38 +++++++++++++------ 6 files changed, 66 insertions(+), 27 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index b125f0f28..294f2f4c0 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -14,6 +14,7 @@ import org.dromara.warm.flow.core.service.DefService; import org.dromara.warm.flow.orm.entity.FlowDefinition; import org.dromara.workflow.domain.vo.FlowDefinitionVo; import org.dromara.workflow.service.IFlwDefinitionService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -33,8 +34,10 @@ import java.util.List; @RequestMapping("/workflow/definition") public class FlwDefinitionController extends BaseController { + @Autowired(required = false) + private DefService defService; + private final IFlwDefinitionService flwDefinitionService; - private final DefService defService; /** * 查询流程定义列表 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index cb65f2158..3393162c7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -14,6 +14,7 @@ import org.dromara.workflow.domain.bo.FlowInstanceBo; import org.dromara.workflow.domain.bo.FlowInvalidBo; import org.dromara.workflow.domain.vo.FlowInstanceVo; import org.dromara.workflow.service.IFlwInstanceService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -31,8 +32,10 @@ import java.util.Map; @RequestMapping("/workflow/instance") public class FlwInstanceController extends BaseController { + @Autowired(required = false) + private InsService insService; + private final IFlwInstanceService flwInstanceService; - private final InsService insService; /** * 查询正在运行的流程实例列表 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java index 0a5c0bb54..368212f10 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java @@ -19,6 +19,7 @@ import org.dromara.workflow.domain.bo.FlowCategoryBo; import org.dromara.workflow.domain.vo.FlowCategoryVo; import org.dromara.workflow.mapper.FlwCategoryMapper; import org.dromara.workflow.service.IFlwCategoryService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -35,8 +36,10 @@ import java.util.List; @Service public class FlwCategoryServiceImpl implements IFlwCategoryService { + @Autowired(required = false) + private DefService defService; + private final FlwCategoryMapper baseMapper; - private final DefService defService; /** * 查询流程分类 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index baec223fe..6ded1a6d4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -36,6 +36,7 @@ import org.dromara.workflow.domain.vo.FlowDefinitionVo; import org.dromara.workflow.mapper.FlwCategoryMapper; import org.dromara.workflow.service.IFlwDefinitionService; import org.dromara.workflow.utils.WorkflowUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -57,12 +58,18 @@ import static org.dromara.common.core.constant.TenantConstants.DEFAULT_TENANT_ID @Service public class FlwDefinitionServiceImpl implements IFlwDefinitionService { - private final DefService defService; - private final FlowDefinitionMapper flowDefinitionMapper; - private final FlowHisTaskMapper flowHisTaskMapper; + @Autowired(required = false) + private DefService defService; + @Autowired(required = false) + private FlowDefinitionMapper flowDefinitionMapper; + @Autowired(required = false) + private FlowHisTaskMapper flowHisTaskMapper; + @Autowired(required = false) + private FlowNodeMapper flowNodeMapper; + @Autowired(required = false) + private FlowSkipMapper flowSkipMapper; + private final FlwCategoryMapper flwCategoryMapper; - private final FlowNodeMapper flowNodeMapper; - private final FlowSkipMapper flowSkipMapper; /** * 查询流程定义列表 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index c053e6d4a..24f86de11 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -47,6 +47,7 @@ import org.dromara.workflow.mapper.FlwInstanceMapper; import org.dromara.workflow.service.IFlwInstanceService; import org.dromara.workflow.service.IFlwTaskService; import org.dromara.workflow.utils.WorkflowUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -64,14 +65,22 @@ import java.util.stream.Collectors; @Service public class FlwInstanceServiceImpl implements IFlwInstanceService { - private final InsService insService; - private final DefService defService; - private final FlowHisTaskMapper flowHisTaskMapper; - private final FlowInstanceMapper flowInstanceMapper; - private final FlwInstanceMapper flwInstanceMapper; - private final TaskService taskService; - private final IFlwTaskService flwTaskService; + @Autowired(required = false) + private InsService insService; + @Autowired(required = false) + private DefService defService; + @Autowired(required = false) + private TaskService taskService; + @Autowired(required = false) + private FlowHisTaskMapper flowHisTaskMapper; + @Autowired(required = false) + private FlowInstanceMapper flowInstanceMapper; + private final FlowProcessEventHandler flowProcessEventHandler; + + private final IFlwTaskService flwTaskService; + + private final FlwInstanceMapper flwInstanceMapper; private final FlwCategoryMapper flwCategoryMapper; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index fca38fbac..11f83ede6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -45,6 +45,7 @@ import org.dromara.workflow.mapper.FlwCategoryMapper; import org.dromara.workflow.mapper.FlwTaskMapper; import org.dromara.workflow.service.IFlwTaskService; import org.dromara.workflow.utils.WorkflowUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -64,19 +65,32 @@ import static org.dromara.workflow.common.constant.FlowConstant.*; @Service public class FlwTaskServiceImpl implements IFlwTaskService { - private final TaskService taskService; - private final InsService insService; - private final FlowInstanceMapper flowInstanceMapper; - private final FlwTaskMapper flwTaskMapper; - private final UserService userService; - private final FlowTaskMapper flowTaskMapper; - private final FlowHisTaskMapper flowHisTaskMapper; - private final FlowProcessEventHandler flowProcessEventHandler; - private final DefService defService; - private final HisTaskService hisTaskService; + @Autowired(required = false) + private TaskService taskService; + @Autowired(required = false) + private InsService insService; + @Autowired(required = false) + private DefService defService; + @Autowired(required = false) + private HisTaskService hisTaskService; + @Autowired(required = false) + private NodeService nodeService; + + @Autowired(required = false) + private FlowInstanceMapper flowInstanceMapper; + @Autowired(required = false) + private FlowTaskMapper flowTaskMapper; + @Autowired(required = false) + private FlowHisTaskMapper flowHisTaskMapper; + @Autowired(required = false) + private FlowNodeMapper flowNodeMapper; + private final IdentifierGenerator identifierGenerator; - private final NodeService nodeService; - private final FlowNodeMapper flowNodeMapper; + private final FlowProcessEventHandler flowProcessEventHandler; + + private final UserService userService; + + private final FlwTaskMapper flwTaskMapper; private final FlwCategoryMapper flwCategoryMapper; /**