From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改

---
 src/main/java/com/whyc/controller/MaterialController.java |   79 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/controller/MaterialController.java b/src/main/java/com/whyc/controller/MaterialController.java
index 493682c..a6967d0 100644
--- a/src/main/java/com/whyc/controller/MaterialController.java
+++ b/src/main/java/com/whyc/controller/MaterialController.java
@@ -1,14 +1,20 @@
 package com.whyc.controller;
 
 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;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 
 @Api(tags = "鐗╂枡绠＄悊")
 @RestController
@@ -39,4 +45,69 @@
         return service.getMaterialLimit(subCode,subName,subModel,pageCurr,pageSize);
     }
 
+    @PostMapping
+    @ApiOperation(value = "鏂板",notes = "瑙ｆ瀽杩斿洖鐨勭粷瀵硅矾寰�,闇�瑕佸洖浼犲埌瀛楁fileUrl")
+    public Response add(@RequestBody List<Material> materialList){
+        return service.add(materialList);
+    }
+
+    @PostMapping("zipParse")
+    @ApiOperation("zip瑙ｆ瀽")
+    public Response zipParse(MultipartFile file) throws IOException, InvalidFormatException {
+        return service.zipParse(file);
+    }
+
+    @ApiOperation(value = "鏍规嵁鐗╂枡id鏌ヨ杩斿洖闄勪欢鏂囦欢澶逛笅鎵�鏈夌殑鏂囦欢鍒楄〃",notes = "9.3淇敼鍚庝娇鐢�")
+    @GetMapping("getAttachByMaterialId")
+    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);
+    }
+
+    @PostMapping("checkNaming")
+    @ApiOperation("鍛藉悕瑙勮寖鏍￠獙")
+    public void checkNaming( HttpServletResponse response,@RequestParam MultipartFile file) throws IOException, InvalidFormatException {
+        service.checkNaming(file.getInputStream(),response);
+    }
+
+    @ApiOperation("鐗╂枡鎺ㄩ�佸脊绐椾娇鐢�")
+    @GetMapping("getMaterialDialog")
+    public Response getMaterialDialog(@RequestParam String subCode,@RequestParam String subName,@RequestParam String subModel)  {
+        return service.getMaterialDialog(subCode,subName,subModel);
+    }
 }

--
Gitblit v1.9.1