From 1da98c8a8207dd062e433242e1567b6418c6ed81 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期六, 06 四月 2024 11:20:29 +0800
Subject: [PATCH] update 优化表单绑定逻辑，移除流程定义配置表单
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
index a19cba1..eb09d4f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
@@ -7,6 +7,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.ProcessDefinitionBo;
@@ -38,11 +39,11 @@
/**
* 鍒嗛〉鏌ヨ
*
- * @param processDefinitionBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
@GetMapping("/list")
- public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo) {
- return actProcessDefinitionService.page(processDefinitionBo);
+ public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo bo, PageQuery pageQuery) {
+ return actProcessDefinitionService.page(bo, pageQuery);
}
/**
@@ -50,9 +51,9 @@
*
* @param key 娴佺▼瀹氫箟key
*/
- @GetMapping("/getProcessDefinitionListByKey/{key}")
- public R<List<ProcessDefinitionVo>> getProcessDefinitionListByKey(@NotEmpty(message = "娴佺▼瀹氫箟key涓嶈兘涓虹┖") @PathVariable String key) {
- return R.ok("鎿嶄綔鎴愬姛", actProcessDefinitionService.getProcessDefinitionListByKey(key));
+ @GetMapping("/getListByKey/{key}")
+ public R<List<ProcessDefinitionVo>> getListByKey(@NotEmpty(message = "娴佺▼瀹氫箟key涓嶈兘涓虹┖") @PathVariable String key) {
+ return R.ok("鎿嶄綔鎴愬姛", actProcessDefinitionService.getListByKey(key));
}
/**
@@ -60,9 +61,9 @@
*
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
- @GetMapping("/processDefinitionImage/{processDefinitionId}")
- public R<String> processDefinitionImage(@PathVariable String processDefinitionId) {
- return R.ok("鎿嶄綔鎴愬姛", actProcessDefinitionService.processDefinitionImage(processDefinitionId));
+ @GetMapping("/definitionImage/{processDefinitionId}")
+ public R<String> definitionImage(@PathVariable String processDefinitionId) {
+ return R.ok("鎿嶄綔鎴愬姛", actProcessDefinitionService.definitionImage(processDefinitionId));
}
/**
@@ -70,10 +71,10 @@
*
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
- @GetMapping("/processDefinitionXml/{processDefinitionId}")
- public R<Map<String, Object>> getXml(@NotBlank(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable String processDefinitionId) {
+ @GetMapping("/definitionXml/{processDefinitionId}")
+ public R<Map<String, Object>> definitionXml(@NotBlank(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable String processDefinitionId) {
Map<String, Object> map = new HashMap<>();
- String xmlStr = actProcessDefinitionService.processDefinitionXml(processDefinitionId);
+ String xmlStr = actProcessDefinitionService.definitionXml(processDefinitionId);
map.put("xml", Arrays.asList(xmlStr.split("\n")));
map.put("xmlStr", xmlStr);
return R.ok(map);
@@ -86,7 +87,6 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
@Log(title = "娴佺▼瀹氫箟绠＄悊", businessType = BusinessType.DELETE)
- @RepeatSubmit()
@DeleteMapping("/{deploymentId}/{processDefinitionId}")
public R<Void> deleteDeployment(@NotBlank(message = "娴佺▼閮ㄧ讲id涓嶈兘涓虹┖") @PathVariable String deploymentId,
@NotBlank(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable String processDefinitionId) {
@@ -100,9 +100,9 @@
*/
@Log(title = "娴佺▼瀹氫箟绠＄悊", businessType = BusinessType.UPDATE)
@RepeatSubmit()
- @PutMapping("/updateProcessDefState/{processDefinitionId}")
- public R<Void> updateProcDefState(@NotBlank(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable String processDefinitionId) {
- return toAjax(actProcessDefinitionService.updateProcessDefState(processDefinitionId));
+ @PutMapping("/updateDefinitionState/{processDefinitionId}")
+ public R<Void> updateDefinitionState(@NotBlank(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable String processDefinitionId) {
+ return toAjax(actProcessDefinitionService.updateDefinitionState(processDefinitionId));
}
/**
@@ -113,10 +113,10 @@
*/
@Log(title = "娴佺▼瀹氫箟绠＄悊", businessType = BusinessType.UPDATE)
@RepeatSubmit()
- @PutMapping("/migrationProcessDefinition/{currentProcessDefinitionId}/{fromProcessDefinitionId}")
- public R<Void> migrationProcessDefinition(@NotBlank(message = "褰撳墠娴佺▼瀹氫箟id") @PathVariable String currentProcessDefinitionId,
- @NotBlank(message = "闇�瑕佽縼绉诲埌鐨勬祦绋嬪畾涔塱d") @PathVariable String fromProcessDefinitionId) {
- return toAjax(actProcessDefinitionService.migrationProcessDefinition(currentProcessDefinitionId, fromProcessDefinitionId));
+ @PutMapping("/migrationDefinition/{currentProcessDefinitionId}/{fromProcessDefinitionId}")
+ public R<Void> migrationDefinition(@NotBlank(message = "褰撳墠娴佺▼瀹氫箟id") @PathVariable String currentProcessDefinitionId,
+ @NotBlank(message = "闇�瑕佽縼绉诲埌鐨勬祦绋嬪畾涔塱d") @PathVariable String fromProcessDefinitionId) {
+ return toAjax(actProcessDefinitionService.migrationDefinition(currentProcessDefinitionId, fromProcessDefinitionId));
}
/**
@@ -138,9 +138,9 @@
* @param categoryCode 鍒嗙被
*/
@Log(title = "娴佺▼瀹氫箟绠＄悊", businessType = BusinessType.INSERT)
- @RepeatSubmit()
@PostMapping("/deployByFile")
- public R<Void> deployByFile(@RequestParam("file") MultipartFile file, @RequestParam("categoryCode") String categoryCode) {
- return toAjax(actProcessDefinitionService.deployByFile(file, categoryCode));
+ public void deployByFile(@RequestParam("file") MultipartFile file, @RequestParam("categoryCode") String categoryCode) {
+ actProcessDefinitionService.deployByFile(file, categoryCode);
}
+
}
--
Gitblit v1.9.3