docs: 流程设计说明

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;

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);

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

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

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
+            act_re_procdef rp
-                LEFT JOIN ACT_RE_DEPLOYMENT rd ON rp.deployment_id_ = rd.id_
+                LEFT JOIN act_re_deployment rd ON rp.deployment_id_ = rd.id_
         <where>
             <if test="name != null and name != ''">
                and rd.name_ like concat('%', #{name}, '%')

ruoyi-ui/src/views/flowable/definition/index.vue

@@ -54,19 +54,17 @@
           v-hasPermi="['system:deployment:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:deployment:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
+    <el-alert title="流程设计说明" type="success">
+      <template slot='title'>
+        <p>流程设计说明:</p>
+        <div>1、XML文件中的流程定义id属性用作流程定义的key参数。</div>
+        <div>2、XML文件中的流程定义name属性用作流程定义的name参数。如果未给定name属性，会使用id作为name。</div>
+        <div>3、当每个唯一key的流程第一次部署时，指定版本为1。对其后所有使用相同key的流程定义，部署时版本会在该key当前已部署的最高版本号基础上加1。key参数用于区分流程定义。</div>
+        <div>4、id参数设置为{processDefinitionKey}:{processDefinitionVersion}:{generated-id}，其中generated-id是一个唯一数字，用以保证在集群环境下，流程定义缓存中，流程id的唯一性。</div>
+      </template>
+    </el-alert>
     <el-table v-loading="loading" fit :data="definitionList" border   @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="流程编号" align="center" prop="deploymentId" :show-overflow-tooltip="true"/>