From f40f45162d69d751628a8fa0c6784abb237d4eaa Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期六, 03 九月 2022 16:48:11 +0800
Subject: [PATCH] 问题修复
---
src/main/java/com/whyc/controller/ProductController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProductController.java b/src/main/java/com/whyc/controller/ProductController.java
index 1416e08..4e41994 100644
--- a/src/main/java/com/whyc/controller/ProductController.java
+++ b/src/main/java/com/whyc/controller/ProductController.java
@@ -1,7 +1,9 @@
package com.whyc.controller;
import com.whyc.dto.Response;
+import com.whyc.pojo.Product;
import com.whyc.service.*;
+import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -44,10 +46,17 @@
, @RequestParam(required = false) String customCode, @RequestParam int pageCurr, @RequestParam int pageSize){
return service.getAllProduct(parentCode,parentName,parentModel,customCode,pageCurr,pageSize);
}
+
+ @ApiOperation(value = "鏌ヨ鍑烘墍鏈夌殑浜у搧鏃犲弬涓嶅垎椤碉紙浜у搧涓婁紶鐨勬槸鐢級",notes = "9.2淇敼鍚庝娇鐢�")
+ @GetMapping("getUpBomUseProduct")
+ public Response getUpBomUseProduct(){
+ return service.getUpBomUseProduct();
+ }
+
@ApiOperation(value = "浜у搧璇︽儏鏌ョ湅鐗堟湰淇℃伅",notes = "8.17淇敼鍚庝娇鐢�")
@GetMapping("getProductVersion")
- public Response getProductVersion( @RequestParam String parentModel, String customCode){
- return historyService.getProductVersion(parentModel,customCode);
+ public Response getProductVersion( @RequestParam String parentCode, String customCode){
+ return historyService.getProductVersion(parentCode,customCode);
}
@ApiOperation(value = "鏍规嵁浜у搧id鍜岀増鏈煡璇㈠瓙浠跺強鍏跺叧鑱旂殑鐗╂枡淇℃伅",notes = "8.17淇敼鍚庝娇鐢�")
@GetMapping("getBomAndMaterial")
@@ -77,8 +86,16 @@
return historyService.setpHistoryEnable(parentCode, customCode, version, enabled);
}
@PostMapping("zipParse")
- @ApiOperation("zip瑙ｆ瀽")
- public Response zipParse(@RequestParam("file") MultipartFile file) throws IOException, InvalidFormatException {
- return service.zipParse(file);
+ @ApiOperation(value = "zip瑙ｆ瀽",notes = "杩斿洖缁撴灉涓�,杩藉姞data3涓哄姣旂粨鏋�,涓簁ey-value闆嗗悎,key涓篸iffList,addList,deleteList")
+ public Response zipParse(@RequestParam("file") MultipartFile file,@RequestParam(required = false) String baseStr) throws IOException, InvalidFormatException {
+ //瑕佸仛瀵规瘮鐨勪骇鍝�,浼犲叆浜嗙墿鏂�(parent_code)鍜屽畾鍒惰〃鍗曞彿(custom_code)
+ Product baseProduct = (baseStr==null?null:ActionUtil.getGson().fromJson(baseStr, Product.class));
+ return service.zipParse(file,baseProduct);
+ }
+
+ @PostMapping
+ @ApiOperation(value = "鏂板",notes = "瑙ｆ瀽鏃惰繑鍥炵殑缁濆璺緞,闇�瑕佸洖浼犲埌瀛楁fileUrl")
+ public Response add(@RequestBody Product product){
+ return service.add(product);
}
}
--
Gitblit v1.9.1