From ad7151b14f2721b0fa40a903c6e65a2c511dd4c5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 15:08:13 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27第二次标准库完成修改
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 ac7a176..48d6c63 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,17 +1,17 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.Product;
+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.*;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* <p>
@@ -29,16 +29,28 @@
@Autowired
private ProductService productService;
- @ApiOperation("鍒犻櫎娴嬭瘯鏍囧噯妯″潡鏁版嵁")
- @DeleteMapping("/delete")
+ @ApiOperation("1銆佸垎椤垫煡璇㈤」鐩�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(value = "娴嬭瘯鏍囧噯ID", name = "productId", dataTypeClass = String.class)
+ @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(value = "鍘熸潗鏂欑紪鐮�/鍘熸潗鏂欏悕绉�", name = "productCodeOrName", dataTypeClass = String.class)
})
- public Result<?> deleteProductInformation(Integer productId) {
- Integer isDeleteProduct = productService.deleteProductInformation(productId);
- if (isDeleteProduct == 1) {
- return Result.success("鍒犻櫎鎴愬姛锛�");
- }
- return Result.fail("鍒犻櫎澶辫触锛�");
+ @GetMapping("/page")
+ public Result<?> pageProductInformation(Integer pageNo, Integer pageSize,String productCodeOrName) {
+ IPage<Map<String, Object>> maps = productService.pageProductInformation(productCodeOrName, 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