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
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
index abe2d9d..5853e6a 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -1,16 +1,17 @@
package com.yuanchu.limslaboratory.controller;
-
-import com.yuanchu.limslaboratory.pojo.SerialNumber;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.service.ProductService;
-import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* <p>
@@ -20,6 +21,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
+@Api(tags = "鏍囧噯搴�-->4銆侀」鐩�")
@RestController
@RequestMapping("/product")
public class ProductController {
@@ -27,4 +29,29 @@
@Autowired
private ProductService productService;
+ @ApiOperation("1銆佸垎椤垫煡璇㈤」鐩�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "specificationsId", value = "瑙勬牸鍨嬪彿ID", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(value = "鍘熸潗鏂欑紪鐮�/鍘熸潗鏂欏悕绉�", name = "productCodeOrName", dataTypeClass = String.class)
+ })
+ @GetMapping("/page")
+ public Result<?> pageProductInformation(Integer pageNo, Integer pageSize, Integer specificationsId, String productCodeOrName) {
+ IPage<Map<String, Object>> maps = productService.pageProductInformation(productCodeOrName, specificationsId, new Page<Objects>(pageNo, pageSize));
+ Map<String, Object> map = new HashMap<>();
+ map.put("row", maps.getRecords());
+ map.put("total", maps.getTotal());
+ return Result.success(map);
+ }
+
+ @ApiOperation("2銆佹牴鎹埗绫绘煡瀛愮被")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(value = "鐖剁被鍚嶇О", name = "fatherName", dataTypeClass = String.class)
+ })
+ @GetMapping("/father")
+ public Result<?> pageFatherNameProductInformation(String fatherName) {
+ List<Map<String, Object>> maps = productService.pageFatherNameProductInformation(fatherName);
+ return Result.success(maps);
+ }
}
--
Gitblit v1.9.3