From 59ae18f04a602bdfdc91299bbe2ff74a2ae1d215 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 13:56:43 +0800
Subject: [PATCH] 改动2.0
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 44b2456..9d025b2 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
@@ -5,12 +5,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
@@ -19,6 +22,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,6 +41,10 @@
@Autowired
private MeteringPlanService meteringPlanService;
+
+ @Resource
+ private UserService userService;
+
@ApiOperation("娣诲姞璁￠噺璁″垝")
@PostMapping("/add")
@@ -72,4 +80,15 @@
public Result<?> limitGetPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto){
return Result.success(meteringPlanService.limitGetPlanMeasureInstrument(dto));
}
+
+ @ApiOperation("鑾峰彇user鍒楄〃鍜屼华鍣ㄥ垪琛�")
+ @GetMapping("/getListUserAndListIns")
+ public Result<?>getListUserAndListIns(){
+ return Result.success(meteringPlanService.getListUserAndListIns(userService.getUserNameAndId()));
+ }
+
+ @PostMapping("/addPlanAndMeasure")
+ public Result<?>addPlanAndMeasure(@RequestBody AddPlanDto addPlanDto){
+ return Result.success(meteringPlanService.addPlanAndMeasure(userService.getUserInfo(ServletUtils.getRequest().getHeader("X-Token")),addPlanDto));
+ }
}
--
Gitblit v1.9.3