From c7795eb09f3059f1a0310bc817e2fa0e9e64d29e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 26 六月 2025 21:15:01 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/controller/WorkflowMainController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorkflowMainController.java b/src/main/java/com/whyc/controller/WorkflowMainController.java
index a7a1fe2..6049e98 100644
--- a/src/main/java/com/whyc/controller/WorkflowMainController.java
+++ b/src/main/java/com/whyc/controller/WorkflowMainController.java
@@ -8,11 +8,15 @@
import com.whyc.service.WorkflowMainService;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
+import com.whyc.util.JsonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.List;
import java.util.Map;
@RestController
@@ -23,10 +27,16 @@
@Autowired
private WorkflowMainService service;
- @PostMapping("submit")
+ /*@PostMapping("submit")
@ApiOperation(value = "鎻愪氦鍗曟嵁", notes = "浼犲弬:taskDesc,mainType,mainTypeCN,mainTypeEn,dealRoleId,processLevel")
public Response<Integer> submit(@RequestBody WorkflowMain main){
return service.submit(main);
+ }*/
+ @PostMapping("submit")
+ @ApiOperation(value = "鎻愪氦鍗曟嵁", notes = "")
+ public Response<Integer> submit(@RequestParam String mainJsonStr, @RequestPart(required = false) List<MultipartFile> fileList, @RequestPart(required = false) List<MultipartFile> picList) throws IOException {
+ WorkflowMain main = JsonUtil.getGson().fromJson(mainJsonStr, WorkflowMain.class);
+ return service.submit(main,fileList,picList);
}
--
Gitblit v1.9.1