diff --git a/pom.xml b/pom.xml index 7e4cb011..f0be7e3d 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 3.5.0 1.3.6 2.3.0 - 6.5.0 + 6.7.2 3.0.1 @@ -275,22 +275,8 @@ org.flowable - flowable-spring-boot-starter-basic + flowable-spring-boot-starter-process ${flowable.version} - - - - org.mybatis - mybatis - - - - - - org.flowable - flowable-engine - ${flowable.version} - compile 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 @@ - - com.ruoyi - ruoyi-framework - com.ruoyi ruoyi-common - - org.projectlombok - lombok - true - - - io.swagger - swagger-annotations - compile - org.flowable - flowable-engine - compile - - - - org.flowable - flowable-spring-boot-starter-basic - - - - - org.springframework.boot - spring-boot-starter-websocket + flowable-spring-boot-starter-process 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 map = new HashMap(); + Map map = new HashMap<>(); if (StringUtils.isNotBlank(procInsId)) { List 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); }