!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.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;
 
     /**
      * 查询流程定义列表

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;
 
     /**
      * 查询正在运行的流程实例列表

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;
 
     /**
      * 查询流程分类

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;
+    @Autowired(required = false)
-    private final FlowDefinitionMapper flowDefinitionMapper;
+    private DefService defService;
-    private final FlowHisTaskMapper flowHisTaskMapper;
+    @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.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;
+    @Autowired(required = false)
-    private final DefService defService;
+    private InsService insService;
-    private final FlowHisTaskMapper flowHisTaskMapper;
+    @Autowired(required = false)
-    private final FlowInstanceMapper flowInstanceMapper;
+    private DefService defService;
-    private final FlwInstanceMapper flwInstanceMapper;
+    @Autowired(required = false)
-    private final TaskService taskService;
+    private TaskService taskService;
-    private final IFlwTaskService flwTaskService;
+    @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.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;
+    @Autowired(required = false)
-    private final InsService insService;
+    private TaskService taskService;
-    private final FlowInstanceMapper flowInstanceMapper;
+    @Autowired(required = false)
-    private final FlwTaskMapper flwTaskMapper;
+    private InsService insService;
-    private final UserService userService;
+    @Autowired(required = false)
-    private final FlowTaskMapper flowTaskMapper;
+    private DefService defService;
-    private final FlowHisTaskMapper flowHisTaskMapper;
+    @Autowired(required = false)
-    private final FlowProcessEventHandler flowProcessEventHandler;
+    private HisTaskService hisTaskService;
-    private final DefService defService;
+    @Autowired(required = false)
-    private final HisTaskService hisTaskService;
+    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 FlowProcessEventHandler flowProcessEventHandler;
-    private final FlowNodeMapper flowNodeMapper;
+
+    private final UserService userService;
+
+    private final FlwTaskMapper flwTaskMapper;
     private final FlwCategoryMapper flwCategoryMapper;
 
     /**