From d88d0c64c357eb2a5f0438c0eb6b5a294ab8a0e5 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 22 八月 2023 08:58:32 +0800
Subject: [PATCH] 删除引入jar包
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 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 38e22ae..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
@@ -1,18 +1,30 @@
package com.yuanchu.limslaboratory.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
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;
/**
* <p>
@@ -30,6 +42,10 @@
@Autowired
private MeteringPlanService meteringPlanService;
+ @Resource
+ private UserService userService;
+
+
@ApiOperation("娣诲姞璁￠噺璁″垝")
@PostMapping("/add")
public Result<?> addMeteringPlanInformation(@RequestBody MeteringPlan meteringPlan) {
@@ -39,4 +55,40 @@
}
return Result.fail("娣诲姞璁￠噺璁″垝澶辫触! ");
}
+
+ @ApiOperation("璁￠噺璁″垝鍒嗛〉鏌ヨ")
+ @GetMapping("/plan_page_list")
+ public Result<?> pagingQueryOfMeteringPlan(SelectMeteringPlanDto dto) {
+ return Result.success(meteringPlanService.pagingQueryOfMeteringPlan(dto));
+ }
+
+ @ApiOperation("璁￠噺鍙拌处鍒嗛〉鏌ヨ")
+ @GetMapping("/standing_page_list")
+ public Result<?> pagingQueryOfMeasurementLedger(SelectMeasurementLedgerDto selectMeasurementLedgerDto) {
+ IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeasurementLedger(selectMeasurementLedgerDto);
+ return Result.success(page);
+ }
+
+ @ApiOperation("鍗曡璁″垝淇℃伅")
+ @GetMapping("/getPlanMeasureInstrument")
+ public Result<?> getPlanMeasureInstrument(GetPlanMeasureInstrumentDto dto){
+ return Result.success(meteringPlanService.getPlanMeasureInstrument(dto));
+ }
+
+ @ApiOperation("璁″垝淇℃伅涔嬩笅鍒嗛〉")
+ @GetMapping("/limitGetPlanMeasureInstrument")
+ 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