fix
This commit is contained in:
@@ -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<WarehouseInfoDO> getAllAndActive(String keyword,Integer pageNum,Integer pageSize);
|
||||
PageInfo<WarehouseInfoDO> getAllAndActive(String keyword, Integer pageNum, Integer pageSize);
|
||||
}
|
||||
|
||||
@@ -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<WarehouseInfoDO> getAllAndActive(String keyword,Integer pageNum,Integer pageSize) {
|
||||
public PageInfo<WarehouseInfoDO> getAllAndActive(String keyword,Integer pageNum,Integer pageSize) {
|
||||
PageHelper.startPage(pageNum,pageSize);
|
||||
return warehouseInfoMapper.getAllAndActive(keyword);
|
||||
List<WarehouseInfoDO> allAndActive = warehouseInfoMapper.getAllAndActive(keyword);
|
||||
return new PageInfo<>(allAndActive);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<List<WarehouseInfoDO>> getAllAndActive(@RequestParam("keyword")String keyword ,
|
||||
@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
|
||||
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
|
||||
public ResponseResult<PageInfo<WarehouseInfoDO>> 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));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user