!636 update 优化 支持通过配置文件关闭工作流 * update 优化 支持通过配置文件关闭工作流

疯狂的牛子Li

2025-01-14 6f0dd8dc8939a6dfd85deb0dc8c818dc3bc0cf01

!636 update 优化 支持通过配置文件关闭工作流
* update 优化 支持通过配置文件关闭工作流

 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java

@@ -14,6 +14,7 @@
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 @@
@RequestMapping("/workflow/definition")
public class FlwDefinitionController extends BaseController {

    @Autowired(required = false)
    private DefService defService;

    private final IFlwDefinitionService flwDefinitionService;
    private final DefService defService;

    /**
     * 查询流程定义列表

 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java

@@ -14,6 +14,7 @@
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 @@
@RequestMapping("/workflow/instance")
public class FlwInstanceController extends BaseController {

    @Autowired(required = false)
    private InsService insService;

    private final IFlwInstanceService flwInstanceService;
    private final InsService insService;

    /**
     * 查询正在运行的流程实例列表

 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java

@@ -19,6 +19,7 @@
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 @@
@Service
public class FlwCategoryServiceImpl implements IFlwCategoryService {

    @Autowired(required = false)
    private DefService defService;

    private final FlwCategoryMapper baseMapper;
    private final DefService defService;

    /**
     * 查询流程分类

 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java

@@ -36,6 +36,7 @@
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 @@
@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;

    /**
     * 查询流程定义列表

 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java

@@ -47,6 +47,7 @@
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 @@
@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;

    /**

 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java

@@ -45,6 +45,7 @@
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 @@
@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;

    /**