From 3e0349f164eb13e86ada765ddeb7f5223d5c65e7 Mon Sep 17 00:00:00 2001 From: hewenqiang <1527468660@qq.com> Date: Thu, 24 Feb 2022 10:41:37 +0800 Subject: [PATCH] =?UTF-8?q?fix=20--=20=E5=B7=A5=E4=BD=9C=E6=B5=81=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=A7=BB=E9=99=A4@Autowired=E5=92=8C@Resource?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=EF=BC=8C=E6=94=B9=E7=94=A8=E6=9E=84=E9=80=A0?= =?UTF-8?q?=E5=99=A8=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/FlowCategoryController.java | 3 +- .../workflow/FlowDefinitionController.java | 13 ++--- .../workflow/FlowInstanceController.java | 6 +-- .../workflow/FlowTaskController.java | 6 +-- .../workflow/SysFormController.java | 14 ++--- .../service/impl/FlowTaskServiceImpl.java | 51 +++++++++---------- .../impl/SysDeployFormServiceImpl.java | 8 +-- .../service/impl/SysFormServiceImpl.java | 8 +-- 8 files changed, 50 insertions(+), 59 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowCategoryController.java index 937c5efd..07d6b4bb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowCategoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowCategoryController.java @@ -19,7 +19,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -37,7 +36,7 @@ import java.util.List; */ @Validated @Api(value = "流程分类控制器", tags = {"流程分类管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/workflow/category") public class FlowCategoryController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java index bb9ecfd0..35a90cc1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java @@ -14,12 +14,11 @@ import com.ruoyi.workflow.service.IFlowDefinitionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; @@ -40,18 +39,16 @@ import java.util.Map; */ @Slf4j @Api(tags = "流程定义") +@RequiredArgsConstructor @RestController @RequestMapping("/workflow/definition") public class FlowDefinitionController extends BaseController { - @Autowired - private IFlowDefinitionService flowDefinitionService; + private final IFlowDefinitionService flowDefinitionService; - @Autowired - private ISysUserService userService; + private final ISysUserService userService; - @Resource - private ISysRoleService sysRoleService; + private final ISysRoleService sysRoleService; @GetMapping(value = "/list") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowInstanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowInstanceController.java index a9930ded..e49c1ead 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowInstanceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowInstanceController.java @@ -7,8 +7,8 @@ import com.ruoyi.workflow.service.IFlowInstanceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -21,12 +21,12 @@ import java.util.Map; */ @Slf4j @Api(tags = "工作流流程实例管理") +@RequiredArgsConstructor @RestController @RequestMapping("/workflow/instance") public class FlowInstanceController { - @Autowired - private IFlowInstanceService flowInstanceService; + private final IFlowInstanceService flowInstanceService; @ApiOperation(value = "根据流程定义id启动流程实例") @PostMapping("/startBy/{procDefId}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowTaskController.java index d7290f8b..e1ed0f4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowTaskController.java @@ -9,8 +9,8 @@ import com.ruoyi.workflow.service.IFlowTaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.imageio.ImageIO; @@ -28,12 +28,12 @@ import java.io.OutputStream; */ @Slf4j @Api(tags = "工作流流程任务管理") +@RequiredArgsConstructor @RestController @RequestMapping("/workflow/task") public class FlowTaskController { - @Autowired - private IFlowTaskService flowTaskService; + private final IFlowTaskService flowTaskService; @ApiOperation(value = "我发起的流程", response = FlowTaskDto.class) @GetMapping(value = "/myProcess") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java index 924a9795..03df18b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java @@ -8,11 +8,11 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; 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.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 javax.servlet.http.HttpServletResponse; @@ -24,14 +24,14 @@ import java.util.List; * @author XuanXuan * @date 2021-04-03 */ +@RequiredArgsConstructor @RestController @RequestMapping("/workflow/form") public class SysFormController extends BaseController { - @Autowired - private ISysFormService SysFormService; - @Autowired - private ISysDeployFormService sysDeployFormService; + private final ISysFormService SysFormService; + + private final ISysDeployFormService sysDeployFormService; /** * 查询流程表单列表 diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java index 802689ea..49163a07 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java @@ -28,6 +28,7 @@ import com.ruoyi.workflow.domain.vo.FlowTaskVo; import com.ruoyi.workflow.domain.vo.FlowViewerVo; import com.ruoyi.workflow.service.IFlowTaskService; import com.ruoyi.workflow.service.ISysDeployFormService; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; 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.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.io.InputStream; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -67,20 +67,16 @@ import java.util.stream.Collectors; * @author XuanXuan * @date 2021-04-03 **/ +@RequiredArgsConstructor @Service @Slf4j public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTaskService { - @Resource - private ISysUserService sysUserService; + private final ISysUserService sysUserService; + private final ISysRoleService sysRoleService; - @Resource - private ISysRoleService sysRoleService; - - - @Resource - private ISysDeployFormService sysInstanceFormService; + private final ISysDeployFormService sysInstanceFormService; /** * 完成任务 @@ -442,23 +438,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask flowTask.setDuration(getDate(time)); } // 流程定义信息 - ProcessDefinition pd = repositoryService.createProcessDefinitionQuery() + ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() .processDefinitionId(hisIns.getProcessDefinitionId()) .singleResult(); - flowTask.setDeployId(pd.getDeploymentId()); + flowTask.setDeployId(processDefinition.getDeploymentId()); flowTask.setProcDefId(hisIns.getProcessDefinitionId()); - flowTask.setProcDefName(pd.getName()); - flowTask.setProcDefVersion(pd.getVersion()); - flowTask.setCategory(pd.getCategory()); - flowTask.setProcDefVersion(pd.getVersion()); + flowTask.setProcDefName(processDefinition.getName()); + flowTask.setProcDefVersion(processDefinition.getVersion()); + flowTask.setCategory(processDefinition.getCategory()); // 当前所处流程 todo: 本地启动放开以下注释 -// List taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list(); -// if (CollectionUtils.isNotEmpty(taskList)) { -// flowTask.setTaskId(taskList.get(0).getId()); -// } else { -// List historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list(); -// flowTask.setTaskId(historicTaskInstance.get(0).getId()); -// } + // List taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list(); + // if (CollectionUtils.isNotEmpty(taskList)) { + // flowTask.setTaskId(taskList.get(0).getId()); + // } else { + // List historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list(); + // flowTask.setTaskId(historicTaskInstance.get(0).getId()); + // } flowList.add(flowTask); } page.setRecords(flowList); @@ -478,8 +473,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask throw new RuntimeException("流程未启动或已执行完成，取消申请失败"); } - ProcessInstance processInstance = - runtimeService.createProcessInstanceQuery().processInstanceId(flowTaskVo.getInstanceId()).singleResult(); + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() + .processInstanceId(flowTaskVo.getInstanceId()).singleResult(); BpmnModel bpmnModel = repositoryService.getBpmnModel(processInstance.getProcessDefinitionId()); if (Objects.nonNull(bpmnModel)) { Process process = bpmnModel.getMainProcess(); @@ -489,12 +484,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask // taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.STOP.getType(), // StringUtils.isBlank(flowTaskVo.getComment()) ? "取消申请" : flowTaskVo.getComment()); String endId = endNodes.get(0).getId(); - List executions = - runtimeService.createExecutionQuery().parentId(processInstance.getProcessInstanceId()).list(); + List executions = runtimeService.createExecutionQuery() + .parentId(processInstance.getProcessInstanceId()).list(); List executionIds = new ArrayList<>(); executions.forEach(execution -> executionIds.add(execution.getId())); - runtimeService.createChangeActivityStateBuilder().moveExecutionsToSingleActivityId(executionIds, - endId).changeState(); + runtimeService.createChangeActivityStateBuilder() + .moveExecutionsToSingleActivityId(executionIds, endId).changeState(); } } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/SysDeployFormServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/SysDeployFormServiceImpl.java index 7cb8255e..4729da9b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/SysDeployFormServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/SysDeployFormServiceImpl.java @@ -1,10 +1,10 @@ package com.ruoyi.workflow.service.impl; -import com.ruoyi.workflow.service.ISysDeployFormService; import com.ruoyi.system.domain.SysDeployForm; import com.ruoyi.system.domain.SysForm; 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 java.util.List; @@ -16,11 +16,11 @@ import java.util.Objects; * @author XuanXuan Xuan * @date 2021-04-03 */ +@RequiredArgsConstructor @Service public class SysDeployFormServiceImpl implements ISysDeployFormService { - @Autowired - private SysDeployFormMapper sysDeployFormMapper; + private final SysDeployFormMapper sysDeployFormMapper; /** * 查询流程实例关联表单 diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/SysFormServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/SysFormServiceImpl.java index 1c617f6a..2845589c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/SysFormServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/SysFormServiceImpl.java @@ -3,10 +3,10 @@ package com.ruoyi.workflow.service.impl; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.workflow.service.ISysFormService; import com.ruoyi.system.domain.SysForm; 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 java.util.List; @@ -17,11 +17,11 @@ import java.util.List; * @author XuanXuan Xuan * @date 2021-04-03 */ +@RequiredArgsConstructor @Service public class SysFormServiceImpl implements ISysFormService { - @Autowired - private SysFormMapper sysFormMapper; + private final SysFormMapper sysFormMapper; /** * 查询流程表单