From c40d7f65624a6f158ec734d2007d7bf8d3b744f4 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 07 九月 2022 11:32:54 +0800
Subject: [PATCH] 软件excel解析
---
src/main/java/com/whyc/controller/WorksheetMainController.java | 70 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorksheetMainController.java b/src/main/java/com/whyc/controller/WorksheetMainController.java
index 04944f9..f58a6c2 100644
--- a/src/main/java/com/whyc/controller/WorksheetMainController.java
+++ b/src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -2,6 +2,8 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
+import com.whyc.dto.WorksheetMainDTO;
+import com.whyc.dto.WorksheetMainDTO2;
import com.whyc.pojo.DocUser;
import com.whyc.pojo.WorksheetMain;
import com.whyc.service.WorksheetMainService;
@@ -10,8 +12,9 @@
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.util.List;
+import java.io.IOException;
import java.util.Map;
@RestController
@@ -24,7 +27,7 @@
@PostMapping("submit")
@ApiOperation("浜у搧鍥剧焊鍙奲om鎻愪氦")
- public Response submit(@RequestBody WorksheetMain main){
+ public Response submit(@RequestBody WorksheetMain main) throws IOException {
DocUser user = ActionUtil.getUser();
boolean res = service.submit(main,user);
if(res) {
@@ -32,6 +35,55 @@
}else{
return new Response().set(1,false,"瑙掕壊鏃犳硶鎻愪氦鍥剧焊");
}
+ }
+
+ @PostMapping("materialRelatedSubmit")
+ @ApiOperation(value="鐗╂枡-浜у搧瀹℃壒鎻愪氦")
+ public Response materialProductSubmit(@RequestBody WorksheetMainDTO mainDTO){
+ DocUser user = ActionUtil.getUser();
+ boolean res = service.MaterialProductSubmit(mainDTO,user);
+ if(res) {
+ return new Response().set(1,true, "鎻愪氦瀹屾垚");
+ }else{
+ return new Response().set(1,false,"瑙掕壊鏃犳硶鎻愪氦瀹℃壒");
+ }
+ }
+
+ @PostMapping("materialSubmit")
+ @ApiOperation(value="鐗╂枡瀹℃壒鎻愪氦")
+ public Response materialSubmit(@RequestBody WorksheetMain main){
+ Response<Object> response = new Response<>();
+ DocUser user = ActionUtil.getUser();
+ Response res = service.materialSubmit(main,user);
+ if(res.getCode()==1) {
+ response.set(1,true, "鎻愪氦瀹屾垚");
+ }else if(res.getCode()==3){
+ response.set(1,false,"瑙掕壊鏃犳硶鎻愪氦瀹℃壒");
+ }else{
+ //閲嶅鎻愪氦
+ Object existCAList = res.getData();
+ Object existMaterialList = res.getData2();
+ response.setCode(1);
+ response.setData(false);
+ response.setData2(existCAList);
+ response.setData3(existMaterialList);
+ if(res.getCode()==21){
+ response.setMsg("閲嶅鎻愪氦:鐜版湁鐗╂枡鍙婃鍦ㄨ繘琛屽鎵圭殑鐗╂枡涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
+ }else if(res.getCode()==22){
+ response.setMsg("閲嶅鎻愪氦:姝ｅ湪杩涜瀹℃壒鐨勭墿鏂欎腑,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勭墿鏂�");
+ }else{
+ response.setMsg("閲嶅鎻愪氦:鐜版湁鐗╂枡涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勭墿鏂�");
+ }
+ }
+ return response;
+ }
+
+ @PostMapping("productSoftwareSubmit")
+ @ApiOperation(value="浜у搧杞欢瀹℃壒鎻愪氦")
+ public Response productSoftwareSubmit(@RequestParam MultipartFile multipartFile,@RequestParam String mainDTOString) throws IOException {
+ DocUser user = ActionUtil.getUser();
+ WorksheetMainDTO2 mainDTO = ActionUtil.getGson().fromJson(mainDTOString, WorksheetMainDTO2.class);
+ return service.productSoftwareSubmit(multipartFile,mainDTO,user);
}
@GetMapping("statusStatistic")
@@ -91,4 +143,18 @@
return new Response().set(1,main);
}
+ @PostMapping("info")
+ @ApiOperation("鏌ヨ宸ヤ綔娴佺殑鏍囬鍙婃弿杩�")
+ public Response getInfo(@RequestParam int id){
+ WorksheetMain main = service.getInfo(id);
+ return new Response().set(1,main);
+ }
+
+ @GetMapping("myListPage")
+ @ApiOperation("鎴戠殑宸ュ崟")
+ public Response<PageInfo<WorksheetMain>> getMyList(@RequestParam int pageNum,@RequestParam int pageSize){
+ DocUser user = ActionUtil.getUser();
+ return service.getMyList(pageNum,pageSize,user);
+ }
+
}
--
Gitblit v1.9.1