From 49ec1df2c772310874b235c312ad3eec447c724c Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 12 Apr 2025 17:55:33 +0800 Subject: [PATCH] fix --- .../java/com/cool/store/service/WarehouseInfoService.java | 3 ++- .../cool/store/service/impl/WarehouseInfoServiceImpl.java | 6 ++++-- .../store/controller/webb/PCWarehouseInfoController.java | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java index 03a412217..4fe0aadda 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java @@ -1,6 +1,7 @@ package com.cool.store.service; import com.cool.store.entity.WarehouseInfoDO; +import com.github.pagehelper.PageInfo; import java.util.List; @@ -12,5 +13,5 @@ import java.util.List; */ public interface WarehouseInfoService { - List getAllAndActive(String keyword,Integer pageNum,Integer pageSize); + PageInfo getAllAndActive(String keyword, Integer pageNum, Integer pageSize); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java index 053999ee1..a369d8ee5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java @@ -4,6 +4,7 @@ import com.cool.store.entity.WarehouseInfoDO; import com.cool.store.mapper.WarehouseInfoMapper; import com.cool.store.service.WarehouseInfoService; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.lowagie.text.PageSize; import org.springframework.stereotype.Service; @@ -23,8 +24,9 @@ public class WarehouseInfoServiceImpl implements WarehouseInfoService { @Resource private WarehouseInfoMapper warehouseInfoMapper; @Override - public List getAllAndActive(String keyword,Integer pageNum,Integer pageSize) { + public PageInfo getAllAndActive(String keyword,Integer pageNum,Integer pageSize) { PageHelper.startPage(pageNum,pageSize); - return warehouseInfoMapper.getAllAndActive(keyword); + List allAndActive = warehouseInfoMapper.getAllAndActive(keyword); + return new PageInfo<>(allAndActive); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java index a009be68d..07beb7709 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java @@ -3,6 +3,7 @@ package com.cool.store.controller.webb; import com.cool.store.entity.WarehouseInfoDO; import com.cool.store.response.ResponseResult; import com.cool.store.service.WarehouseInfoService; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; @@ -29,9 +30,9 @@ public class PCWarehouseInfoController { @GetMapping("/getAllAndActive") @ApiOperation(value = "获取正新鸡排仓库配置") - public ResponseResult> getAllAndActive(@RequestParam("keyword")String keyword , - @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum, - @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) { + public ResponseResult> getAllAndActive(@RequestParam("keyword")String keyword , + @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum, + @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) { return ResponseResult.success(warehouseInfoService.getAllAndActive(keyword,pageNum,pageSize)); } }