diff --git a/pom.xml b/pom.xml index a94677676..4ba306848 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 8.7.2-20240808 - 1.2.3 + 1.2.4 3.2.2 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index d71900ec5..c3e4b6459 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -184,4 +184,19 @@ public class FlwDefinitionController extends BaseController { return R.ok(defService.flowChart(instanceId)); } + /** + * 激活/挂起流程定义 + * + * @param id 流程定义id + * @param active 激活/挂起 + */ + @PutMapping("/updateDefinitionState/{id}/{active}") + public R active(@PathVariable Long id, @PathVariable boolean active) { + if (active) { + return R.ok(defService.unActive(id)); + } else { + return R.ok(defService.active(id)); + } + } + } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index 61abe356c..2edcda60e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -1,6 +1,7 @@ package org.dromara.workflow.controller; import com.warm.flow.core.entity.Instance; +import com.warm.flow.core.service.InsService; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.PageQuery; @@ -24,6 +25,7 @@ import java.util.List; public class FlwInstanceController extends BaseController { private final IFlwInstanceService flwInstanceService; + private final InsService insService; /** * 分页查询正在运行的流程实例 @@ -76,4 +78,19 @@ public class FlwInstanceController extends BaseController { public R cancelProcessApply(@PathVariable String businessId) { return toAjax(flwInstanceService.cancelProcessApply(businessId)); } + + /** + * 激活/挂起流程定义 + * + * @param id 流程定义id + * @param active 激活/挂起 + */ + @PutMapping("/active/{id}/{active}") + public R active(@PathVariable Long id, @PathVariable boolean active) { + if (active) { + return R.ok(insService.unActive(id)); + } else { + return R.ok(insService.active(id)); + } + } }