From fbba4ea24430b14eee18b190b7e08f1a58a8e504 Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期四, 03 八月 2023 13:48:38 +0800 Subject: [PATCH] LIMS管理系统框架-开发8-3 --- laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 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..bc6ea21 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,6 +1,8 @@ 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.service.MeteringPlanService; @@ -8,11 +10,14 @@ import com.yuanchu.limslaboratory.utils.RedisUtil; 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 java.util.Map; +import java.util.Objects; /** * <p> @@ -39,4 +44,27 @@ } return Result.fail("娣诲姞璁¢噺璁″垝澶辫触! "); } + + @ApiOperation("璁¢噺璁″垝鍒嗛〉鏌ヨ") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true), + @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true), + @ApiImplicitParam(name = "measureCodeOrNameOrUnit", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true) + }) + @GetMapping("/plan_page_list") + public Result<?> pagingQueryOfMeteringPlan(Integer pageNo, Integer pageSize, String measureCodeOrNameOrUnit) { + IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeteringPlan(measureCodeOrNameOrUnit, new Page<Objects>(pageNo, pageSize)); + return Result.success(page); + } + + @ApiOperation("璁¢噺鍙拌处鍒嗛〉鏌ヨ") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true), + @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true) + }) + @GetMapping("/standing_page_list") + public Result<?> pagingQueryOfMeasurementLedger(Integer pageNo, Integer pageSize) { + IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeasurementLedger(new Page<Objects>(pageNo, pageSize)); + return Result.success(page); + } } -- Gitblit v1.9.3