From 4e4047e9b523e37fd4d83cbf9fdd5abe201ba278 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 15 二月 2025 13:29:30 +0800
Subject: [PATCH] 添加设备档案导入

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
index 21982ae..76b09bd 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -2,31 +2,35 @@
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.pojo.Laboratory;
 import com.yuanchu.mom.service.LaboratoryService;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.Map;
 
 /**
  * 瀹為獙瀹ょ鐞�(LaboratoryController)琛ㄦ帶鍒跺眰
  */
 @Api(tags = "鍦烘墍鎴栬鏂�")
-@AllArgsConstructor
+
 @RestController
 @RequestMapping("/laboratoryScope")
 public class LaboratoryController {
+    @Value("${file.path}")
+    private String filePath;
 
+    @Resource
     private LaboratoryService laboratoryService;
 
+    @ValueClassify("鍦烘墍鎴栬鏂�")
     @ApiOperation(value = "鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�")
     @PostMapping("/selectItemParameter")
     public Result selectItemParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -34,19 +38,19 @@
         Laboratory itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Laboratory.class);
         return Result.success(laboratoryService.selectItemParameter(page, itemParameter));
     }
-
+    @ValueClassify("鍦烘墍鎴栬鏂�")
     @ApiOperation(value = "娣诲姞瀹為獙瀹ゅ弬鏁�")
     @PostMapping("/addParameter")
     public Result addParameter(@RequestBody Laboratory itemParameter) {
         return Result.success(laboratoryService.addParameter(itemParameter));
     }
-
+    @ValueClassify("鍦烘墍鎴栬鏂�")
     @ApiOperation(value = "鍒犻櫎瀹為獙瀹ゅ弬鏁�")
     @PostMapping("/delParameter")
     public Result<?> delParameter(Integer id) {
         return Result.success(laboratoryService.delParameter(id));
     }
-
+    @ValueClassify("鍦烘墍鎴栬鏂�")
     @ApiOperation(value = "淇敼瀹為獙瀹ゅ弬鏁�")
     @PostMapping("/upParameter")
     public Result<?> upParameter(@RequestBody Laboratory itemParameter) {
@@ -54,11 +58,16 @@
     }
 
     @ApiOperation(value = "鑾峰彇瀹為獙瀹ゅ悕绉�")
-    @PostMapping("/obtainItemParameterList")
-    public Result obtainItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
-        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-        Laboratory itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Laboratory.class);
-        return Result.success(laboratoryService.obtainItemParameterList(page, itemParameter));
+    @GetMapping("/obtainItemParameterList")
+    @ValueAuth
+    public Result obtainItemParameterList() {
+        return Result.success(laboratoryService.obtainItemParameterList());
     }
 }
 
+
+
+
+
+
+

--
Gitblit v1.9.3