From 209e2fceca9e408bf7863f6de98d2a036caec66d Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 19 八月 2022 11:52:18 +0800
Subject: [PATCH] 产品下载
---
src/main/java/com/whyc/controller/WorksheetMainController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorksheetMainController.java b/src/main/java/com/whyc/controller/WorksheetMainController.java
index 52a6e49..7ab7381 100644
--- a/src/main/java/com/whyc/controller/WorksheetMainController.java
+++ b/src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -12,8 +12,10 @@
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 javax.annotation.Resource;
+import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -38,11 +40,11 @@
}
}
- @PostMapping("componentRelatedSubmit")
+ @PostMapping("MaterialRelatedSubmit")
@ApiOperation(value="鏁ｈ浠�-浜у搧瀹℃壒鎻愪氦")
- public Response componentProductSubmit(@RequestBody WorksheetMainDTO mainDTO){
+ public Response MaterialProductSubmit(@RequestBody WorksheetMainDTO mainDTO){
DocUser user = ActionUtil.getUser();
- boolean res = service.componentProductSubmit(mainDTO,user);
+ boolean res = service.MaterialProductSubmit(mainDTO,user);
if(res) {
return new Response().set(1,true, "鎻愪氦瀹屾垚");
}else{
@@ -50,12 +52,12 @@
}
}
- @PostMapping("componentSubmit")
+ @PostMapping("MaterialSubmit")
@ApiOperation(value="鏁ｈ浠跺鎵规彁浜�")
- public Response componentSubmit(@RequestBody WorksheetMain main){
+ public Response MaterialSubmit(@RequestBody WorksheetMain main){
Response<Object> response = new Response<>();
DocUser user = ActionUtil.getUser();
- Response res = service.componentSubmit(main,user);
+ Response res = service.MaterialSubmit(main,user);
if(res.getCode()==1) {
response.set(1,true, "鎻愪氦瀹屾垚");
}else if(res.getCode()==3){
@@ -63,11 +65,11 @@
}else{
//閲嶅鎻愪氦
Object existCAList = res.getData();
- Object existComponentList = res.getData2();
+ Object existMaterialList = res.getData2();
response.setCode(1);
response.setData(false);
response.setData2(existCAList);
- response.setData3(existComponentList);
+ response.setData3(existMaterialList);
if(res.getCode()==21){
response.setMsg("閲嶅鎻愪氦:鐜版湁鏁ｈ浠跺強姝ｅ湪杩涜瀹℃壒鐨勬暎瑁呬欢涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
}else if(res.getCode()==22){
@@ -81,9 +83,10 @@
@PostMapping("productSoftwareSubmit")
@ApiOperation(value="浜у搧杞欢瀹℃壒鎻愪氦")
- public Response productSoftwareSubmit(@RequestBody WorksheetMainDTO2 mainDTO) throws IOException {
+ public Response productSoftwareSubmit(@RequestParam MultipartFile multipartFile,@RequestParam String mainDTOString) throws IOException {
DocUser user = ActionUtil.getUser();
- return service.productSoftwareSubmit(mainDTO,user);
+ WorksheetMainDTO2 mainDTO = ActionUtil.getGson().fromJson(mainDTOString, WorksheetMainDTO2.class);
+ return service.productSoftwareSubmit(multipartFile,mainDTO,user);
}
@GetMapping("statusStatistic")
--
Gitblit v1.9.1