From 5f9e42d921ba2b191199e61cf070da20de39758c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 14:15:36 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
index b4fab11..7864100 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
@@ -3,16 +3,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.other.api.domain.GoodsCategory;
import com.ruoyi.other.service.GoodsCategoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -57,16 +55,11 @@
@GetMapping("/getList")
@ApiOperation(value = "商品分类列表", tags = {"管理后台-商品分类"})
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "分类名称", required = true, dataType = "Integer", paramType = "query"),
- @ApiImplicitParam(name = "current", value = "当前页码，从1开始", required = true, dataType = "Integer", paramType = "query"),
- @ApiImplicitParam(name = "size", value = "每页显示数量，默认10", dataType = "Integer", paramType = "query")
- })
- public R<TableDataInfo<GoodsCategory>> list(IPage<GoodsCategory> page, GoodsCategory goodsCategory){
- startPage();
- List<GoodsCategory> list = goodsCategoryService.list(new LambdaQueryWrapper<GoodsCategory>()
- .eq(StringUtils.isNotEmpty(goodsCategory.getName()), GoodsCategory::getName, goodsCategory.getName()));
- return R.ok(getDataTable(list));
+ public R<Page<GoodsCategory>> list(@ApiParam("页码") @RequestParam Integer PageNum,@ApiParam("每一页数据大小") Integer pageSize, GoodsCategory goodsCategory){
+ Page<GoodsCategory> page = goodsCategoryService.lambdaQuery()
+ .like(StringUtils.isNotEmpty(goodsCategory.getName()),GoodsCategory::getName, goodsCategory.getName())
+ .page(Page.of(PageNum, pageSize));
+ return R.ok(page);
}
@GetMapping("/index/list")
--
Gitblit v1.7.1