From ae4b725f2e3fc5cedb05198ff902b07221fb7bc0 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Mon, 26 Dec 2022 18:56:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:flowable=20=E4=BE=9D=E8=B5=96=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          | 16 +---------------
 ruoyi-flowable/pom.xml                           |  9 +--------
 .../flowable/controller/FlowTaskController.java  |  6 +++---
 .../flowable/factory/FlowServiceFactory.java     |  3 ---
 .../flowable/service/IFlowInstanceService.java   |  2 --
 .../service/impl/FlowInstanceServiceImpl.java    |  7 -------
 6 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9cf4d89e..eec49172 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,31 +184,17 @@
                 <artifactId>ruoyi-flowable</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.flowable</groupId>
-                <artifactId>flowable-spring-boot-starter-basic</artifactId>
+                <artifactId>flowable-spring-boot-starter</artifactId>
                 <version>${flowable.version}</version>
-                <exclusions><!-- 需要排除flowable的mybatis依赖，不然会跟mybatis-plus冲突 -->
-                    <exclusion>
-                        <groupId>org.mybatis</groupId>
-                        <artifactId>mybatis</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
-
             <dependency>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-annotations</artifactId>
                 <version>1.5.21</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.flowable</groupId>
-                <artifactId>flowable-engine</artifactId>
-                <version>${flowable.version}</version>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-boot-starter</artifactId>
diff --git a/ruoyi-flowable/pom.xml b/ruoyi-flowable/pom.xml
index 93762e16..cf132494 100644
--- a/ruoyi-flowable/pom.xml
+++ b/ruoyi-flowable/pom.xml
@@ -55,15 +55,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.flowable</groupId>
-			<artifactId>flowable-engine</artifactId>
-			<scope>compile</scope>
+			<artifactId>flowable-spring-boot-starter</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.flowable</groupId>
-			<artifactId>flowable-spring-boot-starter-basic</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>
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 f2976d1c..9f343016 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
@@ -132,21 +132,21 @@ public class FlowTaskController {
     }
 
     @ApiOperation(value = "委派任务")
-    @PostMapping(value = "/delegate")
+    @PostMapping(value = "/delegateTask")
     public AjaxResult delegate(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.delegateTask(flowTaskVo);
         return AjaxResult.success();
     }
 
     @ApiOperation(value = "任务归还")
-    @PostMapping(value = "/delegate")
+    @PostMapping(value = "/resolveTask")
     public AjaxResult resolveTask(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.resolveTask(flowTaskVo);
         return AjaxResult.success();
     }
 
     @ApiOperation(value = "转办任务")
-    @PostMapping(value = "/assign")
+    @PostMapping(value = "/assignTask")
     public AjaxResult assign(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.assignTask(flowTaskVo);
         return AjaxResult.success();
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/factory/FlowServiceFactory.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/factory/FlowServiceFactory.java
index 2c22ddad..bd1d5de3 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/factory/FlowServiceFactory.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/factory/FlowServiceFactory.java
@@ -28,9 +28,6 @@ public class FlowServiceFactory {
     @Resource
     protected TaskService taskService;
 
-    @Resource
-    protected FormService formService;
-
     @Resource
     protected HistoryService historyService;
 
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowInstanceService.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowInstanceService.java
index 123b066c..1eab1550 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowInstanceService.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowInstanceService.java
@@ -14,8 +14,6 @@ import java.util.Map;
  */
 public interface IFlowInstanceService {
 
-    List<Task> queryListByInstanceId(String instanceId);
-
     /**
      * 结束流程实例
      *
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowInstanceServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowInstanceServiceImpl.java
index 52aab188..cb79e050 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowInstanceServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowInstanceServiceImpl.java
@@ -28,13 +28,6 @@ import java.util.Objects;
 @Slf4j
 public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlowInstanceService {
 
-
-    @Override
-    public List<Task> queryListByInstanceId(String instanceId) {
-        List<Task> list = taskService.createTaskQuery().processInstanceId(instanceId).active().list();
-        return list;
-    }
-
     /**
      * 结束流程实例
      *