diff --git a/pom.xml b/pom.xml index 9cf4d89e..eec49172 100644 --- a/pom.xml +++ b/pom.xml @@ -184,31 +184,17 @@ ruoyi-flowable ${ruoyi.version} - org.flowable - flowable-spring-boot-starter-basic + flowable-spring-boot-starter ${flowable.version} - - - org.mybatis - mybatis - - - io.swagger swagger-annotations 1.5.21 compile - - org.flowable - flowable-engine - ${flowable.version} - compile - com.baomidou mybatis-plus-boot-starter 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 @@ org.flowable - flowable-engine - compile + flowable-spring-boot-starter - - - org.flowable - flowable-spring-boot-starter-basic - - com.baomidou mybatis-plus-boot-starter 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 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 queryListByInstanceId(String instanceId) { - List list = taskService.createTaskQuery().processInstanceId(instanceId).active().list(); - return list; - } - /** * 结束流程实例 *