From 4ba4ea4fcc559a746daf44f276867e97e580019e Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期三, 15 一月 2025 16:56:09 +0800
Subject: [PATCH] update 升级warm-flow到1.6.0-m4
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 1310da3..10d9de8 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
@@ -104,7 +104,6 @@
@Log(title = "娴佺▼瀹氫箟", businessType = BusinessType.INSERT)
@PutMapping("/publish/{id}")
@RepeatSubmit()
- @Transactional(rollbackFor = Exception.class)
public R<Boolean> publish(@PathVariable Long id) {
return R.ok(flwDefinitionService.publish(id));
}
@@ -127,7 +126,6 @@
*/
@Log(title = "娴佺▼瀹氫箟", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- @Transactional(rollbackFor = Exception.class)
public R<Void> remove(@PathVariable List<Long> ids) {
return toAjax(flwDefinitionService.removeDef(ids));
}
@@ -153,9 +151,8 @@
*/
@Log(title = "娴佺▼瀹氫箟", businessType = BusinessType.IMPORT)
@PostMapping("/importDef")
- @Transactional(rollbackFor = Exception.class)
public R<Boolean> importDef(MultipartFile file, String category) {
- return R.ok(flwDefinitionService.importXml(file, category));
+ return R.ok(flwDefinitionService.importJson(file, category));
}
/**
@@ -172,13 +169,13 @@
}
/**
- * 鑾峰彇娴佺▼瀹氫箟xml瀛楃涓�
+ * 鑾峰彇娴佺▼瀹氫箟JSON瀛楃涓�
*
* @param id 娴佺▼瀹氫箟id
*/
@GetMapping("/xmlString/{id}")
public R<String> xmlString(@PathVariable Long id) {
- return R.ok("鎿嶄綔鎴愬姛", defService.xmlString(id));
+ return R.ok("鎿嶄綔鎴愬姛", defService.exportJson(id));
}
/**
@@ -189,6 +186,7 @@
*/
@RepeatSubmit()
@PutMapping("/active/{id}")
+ @Transactional(rollbackFor = Exception.class)
public R<Boolean> active(@PathVariable Long id, @RequestParam boolean active) {
return R.ok(active ? defService.active(id) : defService.unActive(id));
}
--
Gitblit v1.9.3