From 084c0c3ba5600e0b406ea9c7c7c158a527933d4c Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 09:12:58 +0800
Subject: [PATCH] 修改接口新增方式,

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index f0f9007..48f32c0 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -6,6 +6,8 @@
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.mapper.InstrumentMapper;
 import com.yuanchu.limslaboratory.mapper.UserMapper;
 import com.yuanchu.limslaboratory.pojo.Inspection;
 import com.yuanchu.limslaboratory.pojo.Report;
@@ -50,6 +52,9 @@
     @Resource
     UserMapper userMapper;
 
+    @Resource
+    private  InstrumentMapper instrumentMapper;
+
     @ApiOperation(value = "鏌ヨ妫�楠岀敵璇峰崟鍒楄〃")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@@ -57,6 +62,7 @@
             @ApiImplicitParam(name = "message", value = "鐢宠鍗曞彿/鍘熸潗鏂欏悕绉�", dataTypeClass = String.class)
     })
     @GetMapping("/selectInspectsList")
+    @AuthHandler
     public Result selectInspectsList(int pageSize, int countSize, String message) {
         IPage<Map<String, Object>> inspectionPage = inspectionService.selectInspectsList(new Page<Object>(pageSize, countSize), message);
         Map<String, Object> map = new HashMap<>();
@@ -71,6 +77,7 @@
             @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class, required = true)
     })
     @GetMapping("/selectAll")
+    @AuthHandler
     public Result selectAll(Integer type) {
         switch (type) {
             case 0:
@@ -93,6 +100,7 @@
             @ApiImplicitParam(name = "specifications", value = "瑙勬牸鍨嬪彿", dataTypeClass = String.class, required = true)
     })
     @GetMapping("/chooseVer")
+    @AuthHandler
     public Result chooseVer(String name, String mcode, String specifications) {
         return Result.success(inspectionService.chooseVer(name, mcode, specifications));
     }
@@ -105,6 +113,7 @@
             @ApiImplicitParam(name = "experiment", value = "璇曢獙椤圭洰(濮旀墭涓撳睘)", dataTypeClass = String.class )
     })
     @GetMapping("/lookProByVer")
+    @AuthHandler
     public Result lookProByVer(String name, String mcode, String specifications,Integer version,String experiment) {
         return Result.success(inspectionService.lookProByVer(name, mcode, specifications,version,experiment));
     }
@@ -112,7 +121,8 @@
 
     @ApiOperation(value = "鏂板妫�楠屽崟")
     @PostMapping("/addInspect")
-    public Result addInspect(@RequestHeader("token") String token, @Validated @RequestBody InspectionVo inspectionVo) throws Exception {
+    @AuthHandler
+    public Result addInspect(@RequestHeader("X-Token") String token, @Validated @RequestBody InspectionVo inspectionVo) throws Exception {
         Object object = RedisUtil.get(token);
         Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
         return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
@@ -123,15 +133,22 @@
             @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
     })
     @GetMapping("/selectInspectsListById")
+    @AuthHandler
     public Result selectInspectsListById(Integer id) {
         return Result.success(inspectionService.selectInspectsListById(id));
     }
 
     @ApiOperation(value = "閫夋嫨妫�楠岄」鐩殑璐ｄ换浜�")
     @GetMapping("/selectUser")
+    @AuthHandler
     public Result selectUser() {
         return Result.success(userMapper.selectUser());
     }
+
+    @ApiOperation(value = "閫夋嫨妫�楠岃澶�")
+    @GetMapping("/selectEquipment")
+    @AuthHandler
+    public Result selectEquipment(){return Result.success(instrumentMapper.getInstrument());}
 
     @ApiOperation(value = "淇濆瓨妫�楠岄」鐩矗浠讳汉")
     @ApiImplicitParams(value = {
@@ -139,8 +156,16 @@
             @ApiImplicitParam(name = "userProId", value = "璐ｄ换浜篿d", dataTypeClass = Integer.class, required = true)
     })
     @GetMapping("/chooseUseProId")
+    @AuthHandler
     public Result chooseUseProId(Integer id, Integer userProId) {
         return Result.success(inspectionService.chooseUseProId(id, userProId));
+    }
+
+    @ApiOperation("淇濆瓨璁惧id")
+    @GetMapping("/chooseEquipment")
+    @AuthHandler
+    public Result chooseEquipment(Integer id,Integer equipmentId){
+        return Result.success(inspectionService.chooseEquipment(id, equipmentId));
     }
 
     @ApiOperation(value = "浣滃簾妫�楠屽崟")
@@ -148,10 +173,13 @@
             @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
     })
     @PostMapping("/delInspect")
+    @AuthHandler
     public Result delInspect(Integer id) {
         return Result.success(inspectionService.delInspect(id));
     }
 
 
+
+
 }
 

--
Gitblit v1.9.3