From b03b37e1d649631e31f33704a49a46f05aa7dc9f Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 03 七月 2024 16:14:21 +0800
Subject: [PATCH] 2024-7-3 标准库的导入
---
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index 648812a..aa41a21 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -11,7 +11,10 @@
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.service.StandardTreeService;
import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -37,6 +40,7 @@
return Result.success(standardTreeService.selectStandardTreeList());
}
+ @ValueAuth
@ApiOperation(value = "鑾峰彇鏍囧噯鏍�(妫�楠屼笅鍗�)")
@GetMapping("/selectStandardTreeList2")
public Result selectStandardTreeList2() {
@@ -167,9 +171,13 @@
@ValueClassify("鏍囧噯搴�")
@ApiOperation("瀵煎叆鏍囧噯搴�")
- @PostMapping("/inExcelOfTree")
- public Result inExcelOfTree(@RequestParam("file") MultipartFile file) {
- standardTreeService.inExcelOfTree(file);
+ @PostMapping("/inExcelOfTree/{isEquipment}")
+ public Result inExcelOfTree(@RequestParam("file") MultipartFile file, @PathVariable("isEquipment") Boolean isEquipment) {
+ if (!isEquipment) {
+ standardTreeService.inExcelOfTree(file);
+ } else {
+ standardTreeService.importWorkstationExcel(file);
+ }
return Result.success();
}
--
Gitblit v1.9.3