From c0bbd3356de42175a4bf956d37e85bf74c169d4b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 31 八月 2023 12:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
index b877166..ddd7fff 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
@@ -3,13 +3,18 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
 import com.yuanchu.limslaboratory.pojo.Instrument;
 import com.yuanchu.limslaboratory.pojo.MeteringPlan;
+import com.yuanchu.limslaboratory.pojo.dto.AddPlanDto;
+import com.yuanchu.limslaboratory.pojo.dto.GetPlanMeasureInstrumentDto;
 import com.yuanchu.limslaboratory.pojo.dto.SelectMeasurementLedgerDto;
 import com.yuanchu.limslaboratory.pojo.dto.SelectMeteringPlanDto;
 import com.yuanchu.limslaboratory.service.MeteringPlanService;
+import com.yuanchu.limslaboratory.service.UserService;
 import com.yuanchu.limslaboratory.utils.JackSonUtil;
 import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.utils.ServletUtils;
 import com.yuanchu.limslaboratory.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -18,6 +23,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.Map;
 import java.util.Objects;
 
@@ -37,8 +43,13 @@
     @Autowired
     private MeteringPlanService meteringPlanService;
 
+    @Resource
+    private UserService userService;
+
+
     @ApiOperation("娣诲姞璁￠噺璁″垝")
     @PostMapping("/add")
+    @AuthHandler
     public Result<?> addMeteringPlanInformation(@RequestBody MeteringPlan meteringPlan) {
         Integer isInsertSuccess = meteringPlanService.addMeteringPlanInformation(meteringPlan);
         if (isInsertSuccess == 1){
@@ -49,21 +60,44 @@
 
     @ApiOperation("璁￠噺璁″垝鍒嗛〉鏌ヨ")
     @GetMapping("/plan_page_list")
+    @AuthHandler
     public Result<?> pagingQueryOfMeteringPlan(SelectMeteringPlanDto dto) {
         return Result.success(meteringPlanService.pagingQueryOfMeteringPlan(dto));
     }
 
     @ApiOperation("璁￠噺鍙拌处鍒嗛〉鏌ヨ")
     @GetMapping("/standing_page_list")
+    @AuthHandler
     public Result<?> pagingQueryOfMeasurementLedger(SelectMeasurementLedgerDto selectMeasurementLedgerDto) {
         IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeasurementLedger(selectMeasurementLedgerDto);
         return Result.success(page);
     }
 
-    @ApiOperation("鏌ヨ璁￠噺淇℃伅")
-    public Result<?> getPlanMeasureInstrument(Integer id){
-        return Result.success(meteringPlanService.getPlanMeasureInstrument(id));
+    @ApiOperation("鍗曡璁″垝淇℃伅")
+    @GetMapping("/getPlanMeasureInstrument")
+    @AuthHandler
+    public Result<?> getPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto){
+        return Result.success(meteringPlanService.getPlanMeasureInstrument(dto));
     }
 
+    @ApiOperation("璁″垝淇℃伅涔嬩笅鍒嗛〉")
+    @GetMapping("/limitGetPlanMeasureInstrument")
+    @AuthHandler
+    public Result<?> limitGetPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto){
+        return Result.success(meteringPlanService.limitGetPlanMeasureInstrument(dto));
+    }
 
+    @ApiOperation("鑾峰彇user鍒楄〃鍜屼华鍣ㄥ垪琛�")
+    @GetMapping("/getListUserAndListIns")
+    @AuthHandler
+    public Result<?>getListUserAndListIns(){
+        return Result.success(meteringPlanService.getListUserAndListIns(userService.getUserNameAndId()));
+    }
+
+    @ApiOperation("娣诲姞璁″垝鍜岃閲忎俊鎭�")
+    @PostMapping("/addPlanAndMeasure")
+    @AuthHandler
+    public Result<?>addPlanAndMeasure(@RequestBody AddPlanDto addPlanDto){
+        return Result.success(meteringPlanService.addPlanAndMeasure(userService.getUserInfo(ServletUtils.getRequest().getHeader("X-Token")),addPlanDto));
+    }
 }

--
Gitblit v1.9.3