DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix -- 工作流部分移除@Autowired和@Resource注解，改用构造器注入

Browse Source
This commit is contained in:
hewenqiang
2022-02-24 10:41:37 +08:00
parent 863aa2fa33
commit 3e0349f164
8 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowCategoryController.java
View File

@@ -19,7 +19,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -37,7 +36,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "流程分类控制器", tags = {"流程分类管理"}) @Api(value = "流程分类控制器", tags = {"流程分类管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/workflow/category") @RequestMapping("/workflow/category")
public class FlowCategoryController extends BaseController { public class FlowCategoryController extends BaseController {

13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java
View File

@@ -14,12 +14,11 @@ import com.ruoyi.workflow.service.IFlowDefinitionService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@@ -40,18 +39,16 @@ import java.util.Map;
*/ */
@Slf4j @Slf4j
@Api(tags = "流程定义") @Api(tags = "流程定义")
@RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/workflow/definition") @RequestMapping("/workflow/definition")
public class FlowDefinitionController extends BaseController { public class FlowDefinitionController extends BaseController {
@Autowired private final IFlowDefinitionService flowDefinitionService;
private IFlowDefinitionService flowDefinitionService;
@Autowired private final ISysUserService userService;
private ISysUserService userService;
@Resource private final ISysRoleService sysRoleService;
private ISysRoleService sysRoleService;
@GetMapping(value = "/list") @GetMapping(value = "/list")

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowInstanceController.java
View File

@@ -7,8 +7,8 @@ import com.ruoyi.workflow.service.IFlowInstanceService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Map; import java.util.Map;
@@ -21,12 +21,12 @@ import java.util.Map;
*/ */
@Slf4j @Slf4j
@Api(tags = "工作流流程实例管理") @Api(tags = "工作流流程实例管理")
@RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/workflow/instance") @RequestMapping("/workflow/instance")
public class FlowInstanceController { public class FlowInstanceController {
@Autowired private final IFlowInstanceService flowInstanceService;
private IFlowInstanceService flowInstanceService;
@ApiOperation(value = "根据流程定义id启动流程实例") @ApiOperation(value = "根据流程定义id启动流程实例")
@PostMapping("/startBy/{procDefId}") @PostMapping("/startBy/{procDefId}")

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowTaskController.java
View File

@@ -9,8 +9,8 @@ import com.ruoyi.workflow.service.IFlowTaskService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
@@ -28,12 +28,12 @@ import java.io.OutputStream;
*/ */
@Slf4j @Slf4j
@Api(tags = "工作流流程任务管理") @Api(tags = "工作流流程任务管理")
@RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/workflow/task") @RequestMapping("/workflow/task")
public class FlowTaskController { public class FlowTaskController {
@Autowired private final IFlowTaskService flowTaskService;
private IFlowTaskService flowTaskService;
@ApiOperation(value = "我发起的流程", response = FlowTaskDto.class) @ApiOperation(value = "我发起的流程", response = FlowTaskDto.class)
@GetMapping(value = "/myProcess") @GetMapping(value = "/myProcess")

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java
View File

@@ -8,11 +8,11 @@ import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.workflow.service.ISysDeployFormService;
import com.ruoyi.workflow.service.ISysFormService;
import com.ruoyi.system.domain.SysDeployForm; import com.ruoyi.system.domain.SysDeployForm;
import com.ruoyi.system.domain.SysForm; import com.ruoyi.system.domain.SysForm;
import org.springframework.beans.factory.annotation.Autowired; import com.ruoyi.workflow.service.ISysDeployFormService;
import com.ruoyi.workflow.service.ISysFormService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -24,14 +24,14 @@ import java.util.List;
* @author XuanXuan * @author XuanXuan
* @date 2021-04-03 * @date 2021-04-03
*/ */
@RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/workflow/form") @RequestMapping("/workflow/form")
public class SysFormController extends BaseController { public class SysFormController extends BaseController {
@Autowired
private ISysFormService SysFormService;
@Autowired private final ISysFormService SysFormService;
private ISysDeployFormService sysDeployFormService;
private final ISysDeployFormService sysDeployFormService;
/** /**
* 查询流程表单列表 * 查询流程表单列表

51
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
View File

@@ -28,6 +28,7 @@ import com.ruoyi.workflow.domain.vo.FlowTaskVo;
import com.ruoyi.workflow.domain.vo.FlowViewerVo; import com.ruoyi.workflow.domain.vo.FlowViewerVo;
import com.ruoyi.workflow.service.IFlowTaskService; import com.ruoyi.workflow.service.IFlowTaskService;
import com.ruoyi.workflow.service.ISysDeployFormService; import com.ruoyi.workflow.service.ISysDeployFormService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -55,7 +56,6 @@ import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.InputStream; import java.io.InputStream;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@@ -67,20 +67,16 @@ import java.util.stream.Collectors;
* @author XuanXuan * @author XuanXuan
* @date 2021-04-03 * @date 2021-04-03
**/ **/
@RequiredArgsConstructor
@Service @Service
@Slf4j @Slf4j
public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTaskService { public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTaskService {
@Resource private final ISysUserService sysUserService;
private ISysUserService sysUserService;
private final ISysRoleService sysRoleService;
@Resource private final ISysDeployFormService sysInstanceFormService;
private ISysRoleService sysRoleService;
@Resource
private ISysDeployFormService sysInstanceFormService;
/** /**
* 完成任务 * 完成任务
@@ -442,23 +438,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
flowTask.setDuration(getDate(time)); flowTask.setDuration(getDate(time));
} }
// 流程定义信息 // 流程定义信息
ProcessDefinition pd = repositoryService.createProcessDefinitionQuery() ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
.processDefinitionId(hisIns.getProcessDefinitionId()) .processDefinitionId(hisIns.getProcessDefinitionId())
.singleResult(); .singleResult();
flowTask.setDeployId(pd.getDeploymentId()); flowTask.setDeployId(processDefinition.getDeploymentId());
flowTask.setProcDefId(hisIns.getProcessDefinitionId()); flowTask.setProcDefId(hisIns.getProcessDefinitionId());
flowTask.setProcDefName(pd.getName()); flowTask.setProcDefName(processDefinition.getName());
flowTask.setProcDefVersion(pd.getVersion()); flowTask.setProcDefVersion(processDefinition.getVersion());
flowTask.setCategory(pd.getCategory()); flowTask.setCategory(processDefinition.getCategory());
flowTask.setProcDefVersion(pd.getVersion());
// 当前所处流程 todo: 本地启动放开以下注释 // 当前所处流程 todo: 本地启动放开以下注释
// List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list(); // List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list();
// if (CollectionUtils.isNotEmpty(taskList)) { // if (CollectionUtils.isNotEmpty(taskList)) {
// flowTask.setTaskId(taskList.get(0).getId()); // flowTask.setTaskId(taskList.get(0).getId());
// } else { // } else {
// List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list(); // List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
// flowTask.setTaskId(historicTaskInstance.get(0).getId()); // flowTask.setTaskId(historicTaskInstance.get(0).getId());
// } // }
flowList.add(flowTask); flowList.add(flowTask);
} }
page.setRecords(flowList); page.setRecords(flowList);
@@ -478,8 +473,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
throw new RuntimeException("流程未启动或已执行完成，取消申请失败"); throw new RuntimeException("流程未启动或已执行完成，取消申请失败");
} }
ProcessInstance processInstance = ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
runtimeService.createProcessInstanceQuery().processInstanceId(flowTaskVo.getInstanceId()).singleResult(); .processInstanceId(flowTaskVo.getInstanceId()).singleResult();
BpmnModel bpmnModel = repositoryService.getBpmnModel(processInstance.getProcessDefinitionId()); BpmnModel bpmnModel = repositoryService.getBpmnModel(processInstance.getProcessDefinitionId());
if (Objects.nonNull(bpmnModel)) { if (Objects.nonNull(bpmnModel)) {
Process process = bpmnModel.getMainProcess(); Process process = bpmnModel.getMainProcess();
@@ -489,12 +484,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
// taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.STOP.getType(), // taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.STOP.getType(),
// StringUtils.isBlank(flowTaskVo.getComment()) ? "取消申请" : flowTaskVo.getComment()); // StringUtils.isBlank(flowTaskVo.getComment()) ? "取消申请" : flowTaskVo.getComment());
String endId = endNodes.get(0).getId(); String endId = endNodes.get(0).getId();
List<Execution> executions = List<Execution> executions = runtimeService.createExecutionQuery()
runtimeService.createExecutionQuery().parentId(processInstance.getProcessInstanceId()).list(); .parentId(processInstance.getProcessInstanceId()).list();
List<String> executionIds = new ArrayList<>(); List<String> executionIds = new ArrayList<>();
executions.forEach(execution -> executionIds.add(execution.getId())); executions.forEach(execution -> executionIds.add(execution.getId()));
runtimeService.createChangeActivityStateBuilder().moveExecutionsToSingleActivityId(executionIds, runtimeService.createChangeActivityStateBuilder()
endId).changeState(); .moveExecutionsToSingleActivityId(executionIds, endId).changeState();
} }
} }
} }

8
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/SysDeployFormServiceImpl.java
View File

@@ -1,10 +1,10 @@
package com.ruoyi.workflow.service.impl; package com.ruoyi.workflow.service.impl;
import com.ruoyi.workflow.service.ISysDeployFormService;
import com.ruoyi.system.domain.SysDeployForm; import com.ruoyi.system.domain.SysDeployForm;
import com.ruoyi.system.domain.SysForm; import com.ruoyi.system.domain.SysForm;
import com.ruoyi.system.mapper.SysDeployFormMapper; import com.ruoyi.system.mapper.SysDeployFormMapper;
import org.springframework.beans.factory.annotation.Autowired; import com.ruoyi.workflow.service.ISysDeployFormService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@@ -16,11 +16,11 @@ import java.util.Objects;
* @author XuanXuan Xuan * @author XuanXuan Xuan
* @date 2021-04-03 * @date 2021-04-03
*/ */
@RequiredArgsConstructor
@Service @Service
public class SysDeployFormServiceImpl implements ISysDeployFormService { public class SysDeployFormServiceImpl implements ISysDeployFormService {
@Autowired private final SysDeployFormMapper sysDeployFormMapper;
private SysDeployFormMapper sysDeployFormMapper;
/** /**
* 查询流程实例关联表单 * 查询流程实例关联表单

8
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/SysFormServiceImpl.java
View File

@@ -3,10 +3,10 @@ package com.ruoyi.workflow.service.impl;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.workflow.service.ISysFormService;
import com.ruoyi.system.domain.SysForm; import com.ruoyi.system.domain.SysForm;
import com.ruoyi.system.mapper.SysFormMapper; import com.ruoyi.system.mapper.SysFormMapper;
import org.springframework.beans.factory.annotation.Autowired; import com.ruoyi.workflow.service.ISysFormService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@@ -17,11 +17,11 @@ import java.util.List;
* @author XuanXuan Xuan * @author XuanXuan Xuan
* @date 2021-04-03 * @date 2021-04-03
*/ */
@RequiredArgsConstructor
@Service @Service
public class SysFormServiceImpl implements ISysFormService { public class SysFormServiceImpl implements ISysFormService {
@Autowired private final SysFormMapper sysFormMapper;
private SysFormMapper sysFormMapper;
/** /**
* 查询流程表单 * 查询流程表单