From 3adf9180677b33916de30719a1c5a69f3ab8ecc7 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Fri, 23 Aug 2024 21:37:53 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=BF=80=E6=B4=BB/=E6=8C=82=E8=B5=B7=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7warm-flow=E5=88=B01.2.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                         |  2 +-
 .../controller/FlwDefinitionController.java     | 15 +++++++++++++++
 .../controller/FlwInstanceController.java       | 17 +++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a94677676..4ba306848 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         <!-- 面向运行时的D-ORM依赖 -->
         <anyline.version>8.7.2-20240808</anyline.version>
         <!--工作流配置-->
-        <warm-flow>1.2.3</warm-flow>
+        <warm-flow>1.2.4</warm-flow>
 
         <!-- 插件版本 -->
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
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<Boolean> 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<Void> cancelProcessApply(@PathVariable String businessId) {
         return toAjax(flwInstanceService.cancelProcessApply(businessId));
     }
+
+    /**
+     * 激活/挂起流程定义
+     *
+     * @param id     流程定义id
+     * @param active 激活/挂起
+     */
+    @PutMapping("/active/{id}/{active}")
+    public R<Boolean> active(@PathVariable Long id, @PathVariable boolean active) {
+        if (active) {
+            return R.ok(insService.unActive(id));
+        } else {
+            return R.ok(insService.active(id));
+        }
+    }
 }