From 098d3347a0df808908aab8c554cd7c4febc5e6d9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 26 八月 2024 11:43:59 +0800
Subject: [PATCH] !577 发布 5.2.2 正式版 安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
index 31e31e6..842d3d6 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
@@ -10,6 +10,7 @@
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.workflow.domain.bo.ModelBo;
@@ -17,11 +18,13 @@
import org.dromara.workflow.service.IActModelService;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.Model;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
+import java.util.List;
/**
* 妯″瀷绠＄悊 鎺у埗灞�
@@ -34,8 +37,8 @@
@RequestMapping("/workflow/model")
public class ActModelController extends BaseController {
- private final RepositoryService repositoryService;
-
+ @Autowired(required = false)
+ private RepositoryService repositoryService;
private final IActModelService actModelService;
@@ -45,8 +48,8 @@
* @param modelBo 妯″瀷鍙傛暟
*/
@GetMapping("/list")
- public TableDataInfo<Model> page(ModelBo modelBo) {
- return actModelService.page(modelBo);
+ public TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery) {
+ return actModelService.page(modelBo, pageQuery);
}
/**
@@ -124,12 +127,22 @@
/**
* 瀵煎嚭妯″瀷zip鍘嬬缉鍖�
*
- * @param modelId 妯″瀷id
+ * @param modelIds 妯″瀷id
* @param response 鐩稿簲
*/
- @GetMapping("/export/zip/{modelId}")
- public void exportZip(@NotEmpty(message = "妯″瀷id涓嶈兘涓虹┖") @PathVariable String modelId,
+ @GetMapping("/export/zip/{modelIds}")
+ public void exportZip(@NotEmpty(message = "妯″瀷id涓嶈兘涓虹┖") @PathVariable List<String> modelIds,
HttpServletResponse response) {
- actModelService.exportZip(modelId, response);
+ actModelService.exportZip(modelIds, response);
+ }
+
+ /**
+ * 澶嶅埗妯″瀷
+ *
+ * @param modelBo 妯″瀷鏁版嵁
+ */
+ @PostMapping("/copyModel")
+ public R<Void> copyModel(@RequestBody ModelBo modelBo) {
+ return toAjax(actModelService.copyModel(modelBo));
}
}
--
Gitblit v1.9.3