From 95c01301f65379e7634e4619bf4c49186aa5be41 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 14:19:28 +0800
Subject: [PATCH] !644 同步修复一些问题 Merge pull request !644 from 疯狂的狮子Li/dev
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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 294f2f4..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
@@ -12,9 +12,9 @@
import org.dromara.warm.flow.core.entity.Definition;
import org.dromara.warm.flow.core.service.DefService;
import org.dromara.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.domain.vo.FlowDefinitionVo;
import org.dromara.workflow.service.IFlwDefinitionService;
-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.*;
@@ -28,15 +28,14 @@
*
* @author may
*/
+@ConditionalOnEnable
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/workflow/definition")
public class FlwDefinitionController extends BaseController {
- @Autowired(required = false)
- private DefService defService;
-
+ private final DefService defService;
private final IFlwDefinitionService flwDefinitionService;
/**
@@ -105,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));
}
@@ -128,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));
}
@@ -154,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));
}
/**
@@ -173,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));
}
/**
@@ -190,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