From ac4e7d81082a53bf30dd4c06f5e6cf63b850ddd4 Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Tue, 9 Jan 2024 09:02:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/SetmealController.java | 20 ++++++++++++---- .../com/sky/mapper/SetMealDishMapper.java | 11 +++++++++ .../java/com/sky/service/SetmealService.java | 10 ++++++++ .../sky/service/impl/SetmealServiceImpl.java | 21 ++++++++++++++++ .../resources/mapper/SetMealDishMapper.xml | 24 +++++++++++++++++++ 5 files changed, 82 insertions(+), 4 deletions(-) diff --git a/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java b/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java index b009666..fa39c22 100644 --- a/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java +++ b/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java @@ -1,15 +1,14 @@ package com.sky.controller.admin; import com.sky.dto.SetmealDTO; +import com.sky.dto.SetmealPageQueryDTO; +import com.sky.result.PageResult; import com.sky.result.Result; import com.sky.service.SetmealService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -33,4 +32,17 @@ public class SetmealController { setmealService.saveWithDish(setmealDTO); return Result.success(); } + + /** + * 分页查询 + * + * @param setmealPageQueryDTO 请求参数 + * @return 返回数据 + */ + @ApiOperation("分页查询") + @GetMapping("page") + public Result pageResultResult(SetmealPageQueryDTO setmealPageQueryDTO) { + PageResult pageResult = setmealService.pageQuery(setmealPageQueryDTO); + return Result.success(pageResult); + } } diff --git a/sky-server/src/main/java/com/sky/mapper/SetMealDishMapper.java b/sky-server/src/main/java/com/sky/mapper/SetMealDishMapper.java index 2eeeeb4..bcf9b39 100644 --- a/sky-server/src/main/java/com/sky/mapper/SetMealDishMapper.java +++ b/sky-server/src/main/java/com/sky/mapper/SetMealDishMapper.java @@ -1,10 +1,13 @@ package com.sky.mapper; +import com.github.pagehelper.Page; import com.sky.annotation.AutoFill; +import com.sky.dto.SetmealPageQueryDTO; import com.sky.entity.Setmeal; import com.sky.entity.SetmealDish; import com.sky.enumeration.OperationType; import com.sky.vo.DishItemVO; +import com.sky.vo.SetmealVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -41,4 +44,12 @@ public interface SetMealDishMapper { * @param setmealDishes List */ void insertBatch(List setmealDishes); + + /** + * 分页查询 + * + * @param setmealPageQueryDTO SetmealPageQueryDTO + * @return Page + */ + Page pageQuery(SetmealPageQueryDTO setmealPageQueryDTO); } diff --git a/sky-server/src/main/java/com/sky/service/SetmealService.java b/sky-server/src/main/java/com/sky/service/SetmealService.java index 677c0d8..594bf7d 100644 --- a/sky-server/src/main/java/com/sky/service/SetmealService.java +++ b/sky-server/src/main/java/com/sky/service/SetmealService.java @@ -1,7 +1,9 @@ package com.sky.service; import com.sky.dto.SetmealDTO; +import com.sky.dto.SetmealPageQueryDTO; import com.sky.entity.Setmeal; +import com.sky.result.PageResult; import com.sky.vo.DishItemVO; import java.util.List; @@ -31,4 +33,12 @@ public interface SetmealService { * @param setmealDTO SetmealDTO */ void saveWithDish(SetmealDTO setmealDTO); + + /** + * 分页查询 + * + * @param setmealPageQueryDTO SetmealPageQueryDTO + * @return PageResult + */ + PageResult pageQuery(SetmealPageQueryDTO setmealPageQueryDTO); } diff --git a/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java index e264a36..85524f7 100644 --- a/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java +++ b/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java @@ -1,13 +1,18 @@ package com.sky.service.impl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import com.sky.dto.SetmealDTO; +import com.sky.dto.SetmealPageQueryDTO; import com.sky.entity.Setmeal; import com.sky.entity.SetmealDish; import com.sky.mapper.DishMapper; import com.sky.mapper.SetMealDishMapper; import com.sky.mapper.SetmealMapper; +import com.sky.result.PageResult; import com.sky.service.SetmealService; import com.sky.vo.DishItemVO; +import com.sky.vo.SetmealVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -70,4 +75,20 @@ public class SetmealServiceImpl implements SetmealService { // 保存套餐和菜品的关联关系 setmealDishMapper.insertBatch(setmealDishes); } + + /** + * 分页查询 + * + * @param setmealPageQueryDTO SetmealPageQueryDTO + * @return PageResult + */ + @Override + public PageResult pageQuery(SetmealPageQueryDTO setmealPageQueryDTO) { + int pageNum = setmealPageQueryDTO.getPage(); + int pageSize = setmealPageQueryDTO.getPageSize(); + + PageHelper.startPage(pageNum, pageSize); + Page page = setmealDishMapper.pageQuery(setmealPageQueryDTO); + return new PageResult(page.getTotal(), page.getResult()); + } } diff --git a/sky-server/src/main/resources/mapper/SetMealDishMapper.xml b/sky-server/src/main/resources/mapper/SetMealDishMapper.xml index ae53299..7133a6c 100644 --- a/sky-server/src/main/resources/mapper/SetMealDishMapper.xml +++ b/sky-server/src/main/resources/mapper/SetMealDishMapper.xml @@ -60,4 +60,28 @@ left join dish d on sd.dish_id = d.id where sd.setmeal_id = #{setmealId} + + +