From f92783da5430037bf80cf28a5cf7091cdecefbb7 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 09 五月 2025 09:23:51 +0800
Subject: [PATCH] 追加用户邮件备注
---
src/main/java/com/whyc/controller/MaterialController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/MaterialController.java b/src/main/java/com/whyc/controller/MaterialController.java
index e0b63ea..a6967d0 100644
--- a/src/main/java/com/whyc/controller/MaterialController.java
+++ b/src/main/java/com/whyc/controller/MaterialController.java
@@ -5,13 +5,13 @@
import com.whyc.service.MaterialService;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
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.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
@@ -85,9 +85,29 @@
return service.addAttachment(multipartFileList,material);
}
- @ApiModelProperty("鐗╂枡鍥剧焊瀵规瘮")
+ @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