From f70fa07209efa3ceb733d431732b3f7b0dfa0f04 Mon Sep 17 00:00:00 2001 From: tony <846249920@qq.com> Date: Thu, 29 Dec 2022 10:15:55 +0800 Subject: [PATCH] =?UTF-8?q?docs:=20=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlowDefinitionController.java | 3 ++- .../controller/FlowTaskController.java | 4 ++-- .../service/IFlowDefinitionService.java | 3 ++- .../impl/FlowDefinitionServiceImpl.java | 2 ++ .../mapper/flowable/FlowDeployMapper.xml | 6 +++--- .../src/views/flowable/definition/index.vue | 20 +++++++++---------- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowDefinitionController.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowDefinitionController.java index 2a0b7d98..e7ae0d0a 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowDefinitionController.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowDefinitionController.java @@ -1,5 +1,6 @@ package com.ruoyi.flowable.controller; +import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; @@ -44,7 +45,7 @@ import java.util.Map; @Api(tags = "流程定义") @RestController @RequestMapping("/flowable/definition") -public class FlowDefinitionController { +public class FlowDefinitionController extends BaseController { @Autowired private IFlowDefinitionService flowDefinitionService; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java index b5e6a122..226857da 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java @@ -183,7 +183,7 @@ public class FlowTaskController { * * @param processId 任务ID */ - @RequestMapping("/diagram/{processId}") + @GetMapping("/diagram/{processId}") public void genProcessDiagram(HttpServletResponse response, @PathVariable("processId") String processId) { InputStream inputStream = flowTaskService.diagram(processId); @@ -216,7 +216,7 @@ public class FlowTaskController { * @param procInsId 流程实例编号 * @param procInsId 任务执行编号 */ - @RequestMapping("/flowViewer/{procInsId}/{executionId}") + @GetMapping("/flowViewer/{procInsId}/{executionId}") public AjaxResult getFlowViewer(@PathVariable("procInsId") String procInsId, @PathVariable("executionId") String executionId) { return flowTaskService.getFlowViewer(procInsId, executionId); diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowDefinitionService.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowDefinitionService.java index c46f390a..f395bf27 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowDefinitionService.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowDefinitionService.java @@ -28,7 +28,8 @@ public interface IFlowDefinitionService { /** * 导入流程文件 - * + * 当每个key的流程第一次部署时，指定版本为1。对其后所有使用相同key的流程定义， + * 部署时版本会在该key当前已部署的最高版本号基础上加1。key参数用于区分流程定义 * @param name * @param category * @param in diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java index 7987d492..d10e16b7 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java @@ -125,6 +125,8 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl /** * 导入流程文件 * + * 当每个key的流程第一次部署时，指定版本为1。对其后所有使用相同key的流程定义， + * 部署时版本会在该key当前已部署的最高版本号基础上加1。key参数用于区分流程定义 * @param name * @param category * @param in diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml index 9e586ae6..a173b7d6 100644 --- a/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml @@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT rp.id_ as id, - rd.id_ as deploymentId, + rd.deployment_id_ as deploymentId, rd.name_ as name, rd.category_ as category, rp.key_ as flowKey, @@ -17,8 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rp.suspension_state_ as suspensionState, rd.deploy_time_ as deploymentTime FROM - ACT_RE_PROCDEF rp - LEFT JOIN ACT_RE_DEPLOYMENT rd ON rp.deployment_id_ = rd.id_ + act_re_procdef rp + LEFT JOIN act_re_deployment rd ON rp.deployment_id_ = rd.id_ and rd.name_ like concat('%', #{name}, '%') diff --git a/ruoyi-ui/src/views/flowable/definition/index.vue b/ruoyi-ui/src/views/flowable/definition/index.vue index 6c26e510..4bb9715f 100644 --- a/ruoyi-ui/src/views/flowable/definition/index.vue +++ b/ruoyi-ui/src/views/flowable/definition/index.vue @@ -54,19 +54,17 @@ v-hasPermi="['system:deployment:remove']" >删除 - - 导出 - - + + +