菜品分页

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/AppDevuceController.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.system.controller.app.devuce;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.dishestype.vo.DishesTypeRespVO;
 import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceReqVO;
+import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceRespVO;
 import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dishes.DishesDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dishestype.DishesTypeDO;
@@ -84,6 +86,14 @@ public class AppDevuceController {
         List<DishesDO> dishesList = devuceService.getDishesList(carteenId,dishecType,dishesName);
         return success(BeanUtils.toBean(dishesList, DishesRespVO.class));
     }
+
+    @GetMapping("/dishes/page")
+    @Operation(summary = "获得菜品列表分页")
+    public  CommonResult< PageResult<DevuceRespVO>> getDishesPage(Long carteenId,Long dishecType,String dishesName,Integer pageNo,Integer pageSize) {
+        PageResult<DishesDO> dishesList = devuceService.getDishesPage(carteenId,dishecType,dishesName,pageNo,pageSize);
+        return success(BeanUtils.toBean(dishesList, DevuceRespVO.class));
+    }
+
     @GetMapping("/list")
     @Operation(summary = "获得绑定的菜品")
     public CommonResult<DishesRespVO> getDevuceList(){

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java

@@ -67,6 +67,8 @@ public interface DevuceService {
     DishesDO getDevuceList();
 
     List<DishesDO> getDishesList(Long carteenId,Long dishecType,String dishesName);
+
+    PageResult<DishesDO> getDishesPage(Long carteenId, Long dishecType, String dishesName,Integer pageNo,Integer pageSize);
     /**
      * @Description: 获取菜品分类
      * @Author: qjq

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.devuce.vo.DevuceListVO;
@@ -33,6 +34,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -190,6 +192,28 @@ public class DevuceServiceImpl implements DevuceService {
 
     }
 
+    @Override
+    public PageResult<DishesDO> getDishesPage(Long carteenId, Long dishecType, String dishesName,Integer pageNo,Integer pageSize) {
+        String mac = this.getHearder();
+        DeviceInfoDO deviceInfoDO = deviceInfoMapper.selectOne(new LambdaQueryWrapper<DeviceInfoDO>()
+                .eq(DeviceInfoDO::getDeviceIp, mac)
+                .last("limit 1"));
+        if(ObjectUtil.isNotEmpty(deviceInfoDO)){
+            carteenId = deviceInfoDO.getCarteenId();
+        }
+        PageParam pageParam = new PageParam();
+        pageParam.setPageNo(pageNo);
+        pageParam.setPageSize(pageSize);
+        PageResult<DishesDO> dishesDOPageResult = dishesMapper.selectPage(pageParam, null, new LambdaQueryWrapperX<DishesDO>()
+                .eq(DishesDO::getCarteenId, carteenId)
+                .gt(DishesDO::getId, 94)
+                .eq(dishecType != null, DishesDO::getDishecType, dishecType)
+                .like(StrUtil.isNotBlank(dishesName), DishesDO::getDishesName, dishesName)
+                .orderByDesc(DishesDO::getId));
+
+        return dishesDOPageResult;
+    }
+
     /**
      * @param carteenId
      * @return