From 6fd28f02eba30929e56f2933c754193655bb4087 Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: Wed, 19 Jan 2022 17:46:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BC=98=E5=8C=96flowable=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97jar=E5=8C=85=E4=BE=9D=E8=B5=96=EF=BC=8C=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7flowable=206.5.0=20->=206.7.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 18 ++----------
 ruoyi-flowable/pom.xml                        | 28 +------------------
 .../service/impl/FlowTaskServiceImpl.java     | 20 ++++++-------
 3 files changed, 13 insertions(+), 53 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7e4cb011..f0be7e3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
         <dynamic-ds.version>3.5.0</dynamic-ds.version>
         <tlog.version>1.3.6</tlog.version>
         <xxl-job.version>2.3.0</xxl-job.version>
-        <flowable.version>6.5.0</flowable.version>
+        <flowable.version>6.7.2</flowable.version>
 
         <!-- jdk11 缺失依赖 jaxb-->
         <jaxb.version>3.0.1</jaxb.version>
@@ -275,22 +275,8 @@
 
             <dependency>
                 <groupId>org.flowable</groupId>
-                <artifactId>flowable-spring-boot-starter-basic</artifactId>
+                <artifactId>flowable-spring-boot-starter-process</artifactId>
                 <version>${flowable.version}</version>
-                <exclusions>
-                    <!-- 需要排除flowable的mybatis依赖，不然会跟mybatis-plus冲突 -->
-                    <exclusion>
-                        <groupId>org.mybatis</groupId>
-                        <artifactId>mybatis</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.flowable</groupId>
-                <artifactId>flowable-engine</artifactId>
-                <version>${flowable.version}</version>
-                <scope>compile</scope>
             </dependency>
 
             <!-- OSS对象存储模块 -->
diff --git a/ruoyi-flowable/pom.xml b/ruoyi-flowable/pom.xml
index 7c059529..1c289095 100644
--- a/ruoyi-flowable/pom.xml
+++ b/ruoyi-flowable/pom.xml
@@ -13,40 +13,14 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-framework</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.flowable</groupId>
-            <artifactId>flowable-engine</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.flowable</groupId>
-            <artifactId>flowable-spring-boot-starter-basic</artifactId>
-        </dependency>
-
-        <dependency>
-            <!-- websocket -->
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
+            <artifactId>flowable-spring-boot-starter-process</artifactId>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.eweb4j/fel -->
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 a19a5d73..8c0cfd9c 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
@@ -2,29 +2,29 @@ package com.ruoyi.workflow.service.impl;
 
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.LoginUtils;
 import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.flowable.common.enums.FlowComment;
+import com.ruoyi.flowable.factory.FlowServiceFactory;
+import com.ruoyi.flowable.flow.CustomProcessDiagramGenerator;
+import com.ruoyi.flowable.flow.FindNextNodeUtil;
+import com.ruoyi.flowable.flow.FlowableUtils;
+import com.ruoyi.system.domain.SysForm;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.workflow.domain.dto.FlowCommentDto;
 import com.ruoyi.workflow.domain.dto.FlowNextDto;
 import com.ruoyi.workflow.domain.dto.FlowTaskDto;
 import com.ruoyi.workflow.domain.vo.FlowTaskVo;
 import com.ruoyi.workflow.domain.vo.FlowViewerVo;
-import com.ruoyi.flowable.factory.FlowServiceFactory;
-import com.ruoyi.flowable.flow.CustomProcessDiagramGenerator;
-import com.ruoyi.flowable.flow.FindNextNodeUtil;
-import com.ruoyi.flowable.flow.FlowableUtils;
 import com.ruoyi.workflow.service.IFlowTaskService;
 import com.ruoyi.workflow.service.ISysDeployFormService;
-import com.ruoyi.system.domain.SysForm;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -682,7 +682,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      */
     @Override
     public R flowRecord(String procInsId, String deployId) {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         if (StringUtils.isNotBlank(procInsId)) {
             List<HistoricActivityInstance> list = historyService
                     .createHistoricActivityInstanceQuery()
@@ -748,7 +748,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             if (Objects.isNull(sysForm)) {
                 return R.error("请先配置流程表单");
             }
-            map.put("formData", JSONObject.parseObject(sysForm.getFormContent()));
+            map.put("formData", JsonUtils.parseObject(sysForm.getFormContent(), Map.class));
         }
         return R.success(map);
     }