From fcdb42dcfda2adccfd8cf42e16c2d6fa73732f1d Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 13 三月 2023 10:41:38 +0800
Subject: [PATCH] Revert "旧数据类别可以修复的(物料只对应1个类别的),填充物料类别"
---
src/main/java/com/whyc/controller/MaterialController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/controller/MaterialController.java b/src/main/java/com/whyc/controller/MaterialController.java
index 3717d94..9454988 100644
--- a/src/main/java/com/whyc/controller/MaterialController.java
+++ b/src/main/java/com/whyc/controller/MaterialController.java
@@ -3,6 +3,7 @@
import com.whyc.dto.Response;
import com.whyc.pojo.Material;
import com.whyc.service.MaterialService;
+import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -11,6 +12,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
@Api(tags = "鐗╂枡绠＄悊")
@@ -59,4 +61,40 @@
public Response getAttachByMaterialId(@RequestParam int materialId){
return service.getAttachByMaterialId(materialId);
}
+
+
+ @ApiOperation(value = "鏍规嵁鐗╂枡鍨嬪彿锛�'-','_'涔嬪墠鐨勯儴鍒嗭級鏌ヨ鐗╂枡鐨勫巻鍙茬増鏈�",notes = "9.3淇敼鍚庝娇鐢�")
+ @GetMapping("getMaterialVersion")
+ public Response getMaterialVersion(@RequestParam String subModel){
+ return service.getMaterialVersion(subModel);
+ }
+
+ @ApiOperation(value = "鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅",notes = "9.3淇敼鍚庝娇鐢�")
+ @GetMapping("getMaterialById")
+ public Response getMaterialById(@RequestParam int materialId){
+ return service.getMaterialById(materialId);
+ }
+
+ /**鐗╂枡id-鐗╂枡缂栫爜-鐗╂枡鍨嬪彿*/
+ @ApiOperation(value = "杩藉姞闄勪欢",notes = "materialStr涓簀son瀛楃涓�,鍖呭惈id,subCode,subModel")
+ @PostMapping("attachment")
+ public Response addAttachment(@RequestParam String materialStr, @RequestParam MultipartFile... file) throws IOException {
+ Material material = ActionUtil.getGson().fromJson(materialStr, Material.class);
+ List<MultipartFile> multipartFileList = Arrays.asList(file);
+ return service.addAttachment(multipartFileList,material);
+ }
+
+ @ApiOperation("鐗╂枡鍥剧焊瀵规瘮")
+ @GetMapping("dwgCompare")
+ public Response dwgCompare(@RequestParam int materialId,@RequestParam int materialId2) throws IOException {
+ return service.dwgCompare(materialId,materialId2);
+ }
+
+ /**鐗╂枡id-鐗╂枡缂栫爜-鐗╂枡鍨嬪彿*/
+ @ApiOperation(value = "鏇存柊鍥剧墖鎴栬�呭浘绾�",notes = "materialStr涓簀son瀛楃涓�,鍖呭惈id,subCode,subModel")
+ @PutMapping("picOrDwg")
+ public Response updatePicOrDwg(@RequestParam String materialStr, @RequestPart MultipartFile file) throws IOException {
+ Material material = ActionUtil.getGson().fromJson(materialStr, Material.class);
+ return service.updatePicOrDwg(file,material);
+ }
}
--
Gitblit v1.9.1