From 019516318143996bb3a03aff971146b691f153b8 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sat, 17 Aug 2024 11:18:53 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FlwDefinitionController.java   | 19 ++++++++++++-----
 .../service/IFlwDefinitionService.java        |  9 ++++++++
 .../impl/FlwDefinitionServiceImpl.java        | 21 +++++++++++++++++++
 3 files changed, 44 insertions(+), 5 deletions(-)

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 74b9c9891..d71900ec5 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
@@ -46,6 +46,16 @@ public class FlwDefinitionController extends BaseController {
         return iFlwDefinitionService.page(flowDefinition, pageQuery);
     }
 
+    /**
+     * 获取历史流程定义列表
+     *
+     * @param flowCode 参数
+     */
+    @GetMapping("/getHisListByKey/{flowCode}")
+    public R<List<FlowDefinitionVo>> getHisListByKey(@PathVariable String flowCode) {
+        return R.ok(iFlwDefinitionService.getHisListByKey(flowCode));
+    }
+
     /**
      * 获取流程定义详细信息
      *
@@ -86,7 +96,7 @@ public class FlwDefinitionController extends BaseController {
      * @param id 流程定义id
      */
     @Log(title = "流程定义", businessType = BusinessType.INSERT)
-    @GetMapping("/publish/{id}")
+    @PutMapping("/publish/{id}")
     @Transactional(rollbackFor = Exception.class)
     public R<Boolean> publish(@PathVariable Long id) {
         return R.ok(defService.publish(id));
@@ -98,11 +108,10 @@ public class FlwDefinitionController extends BaseController {
      * @param id 流程定义id
      */
     @Log(title = "流程定义", businessType = BusinessType.INSERT)
-    @GetMapping("/unPublish/{id}")
+    @PutMapping("/unPublish/{id}")
     @Transactional(rollbackFor = Exception.class)
-    public R<Void> unPublish(@PathVariable Long id) {
-        defService.unPublish(id);
-        return R.ok();
+    public R<Boolean> unPublish(@PathVariable Long id) {
+        return R.ok(defService.unPublish(id));
     }
 
     /**
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java
index eebab213a..01b82f0b0 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java
@@ -8,6 +8,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.workflow.domain.vo.FlowDefinitionVo;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * 流程定义 服务层
@@ -24,6 +25,14 @@ public interface IFlwDefinitionService {
      */
     TableDataInfo<FlowDefinitionVo> page(FlowDefinition flowDefinition, PageQuery pageQuery);
 
+    /**
+     * 获取历史流程定义列表
+     *
+     * @param flowCode 参数
+     * @return 返回列表
+     */
+    List<FlowDefinitionVo> getHisListByKey(String flowCode);
+
     /**
      * 导出流程定义
      *
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
index a0d1cf30e..1cc3b45d6 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
@@ -1,10 +1,13 @@
 package org.dromara.workflow.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.warm.flow.core.entity.Definition;
+import com.warm.flow.core.enums.PublishStatus;
 import com.warm.flow.core.service.DefService;
 import com.warm.flow.core.utils.page.Page;
 import com.warm.flow.orm.entity.FlowDefinition;
+import com.warm.flow.orm.mapper.FlowDefinitionMapper;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +21,8 @@ import org.dromara.workflow.service.IFlwDefinitionService;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 流程定义 服务层实现
@@ -30,6 +35,8 @@ import java.io.IOException;
 public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
     private final DefService defService;
 
+    private final FlowDefinitionMapper flowDefinitionMapper;
+
     /**
      * 分页查询
      *
@@ -46,6 +53,20 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
         return build;
     }
 
+    /**
+     * 获取历史流程定义列表
+     *
+     * @param flowCode 参数
+     */
+    @Override
+    public List<FlowDefinitionVo> getHisListByKey(String flowCode) {
+        LambdaQueryWrapper<FlowDefinition> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FlowDefinition::getFlowCode, flowCode);
+        wrapper.in(FlowDefinition::getIsPublish, Arrays.asList(PublishStatus.UNPUBLISHED.getKey(), PublishStatus.EXPIRED.getKey()));
+        List<FlowDefinition> list = flowDefinitionMapper.selectList(wrapper);
+        return BeanUtil.copyToList(list, FlowDefinitionVo.class);
+    }
+
     /**
      * 导出流程定义
      *