修改分页

jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java

@@ -71,15 +71,15 @@ public class InventoryController {
         return ApiRes.success(inventoryService.UpdateCabinetInsNum(req));
     }
 
-    //根据Epc获取装备简要信息
+    //根据Epc获取装备信息
     @PostMapping("/GetInvInfoByEpc")
-    @ApiOperation("根据EPC列表获取装备信息（简要）")
+    @ApiOperation("根据EPC列表获取装备信息")
     public ApiRes<List<InventoryDto>> GetInvInfoByEpc(@RequestBody InventoryReq req){
         return ApiRes.success(inventoryService.GetInvInfoByEpc(req));
     }
 
 
-    //根据组织机构id/单警柜id/仓库id查询出库存的汇总信息√
+    //根据组织机构id/单警柜id/仓库id查询出库存的汇总信息(page)
     @PostMapping("/GetEquipmentInfo")
     @ApiOperation("根据条件查询库存汇总信息")
     public ApiRes<PageResult<InventorySummary>> getEquipmentInfo(@RequestBody InventorySumReq req) {

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java

@@ -213,8 +213,18 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
         }else {
             throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
         }
-        long pageSize = 20L;
-        long pageNo = 1L;
+        long pageSize;
+        long pageNo;
+        if (ObjectUtil.isNull(req.getPageNo())){
+            pageNo = 1L;
+        }else {
+            pageNo= req.getPageNo();
+        }
+        if ( ObjectUtil.isNull(req.getPageSize())){
+            pageSize = 20L;
+        }else {
+            pageSize= req.getPageSize();
+        }
         Page<InventoryDto> page=new Page<>(pageNo,pageSize);
         IPage<InventoryDto> pages= inventoryMapper.EqsByTypePage(page,req.getQueryType(),req.getOrgId(),req.getWarehouseId(),req.getCabinetId());
         page.setRecords(pages.getRecords());
@@ -266,8 +276,18 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
         //判断货架是否存在
         Shelf shelf = shelfService.ShelfExist(req.getShelfId());
         warehouseService.WarehoustExist(shelf.getWarehouseId());
-        long pageSize = 20L;
-        long pageNo = 1L;
+        long pageSize;
+        long pageNo;
+        if (ObjectUtil.isNull(req.getPageNo())){
+            pageNo = 1L;
+        }else {
+            pageNo= req.getPageNo();
+        }
+        if ( ObjectUtil.isNull(req.getPageSize())){
+            pageSize = 20L;
+        }else {
+            pageSize= req.getPageSize();
+        }
         Page<InventorySummary> page=new Page<>(pageNo,pageSize);
         IPage<InventorySummary> pages = inventoryMapper.ShelfInventoryPage(page,req.getShelfId());
         pages.setRecords(pages.getRecords());
@@ -319,8 +339,18 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
         //判断区域是否存在
         WarehouseArea warehouseArea = warehouseAreaService.WarehouseAreaExist(req.getId());
         warehouseService.WarehoustExist(warehouseArea.getWarehouseId());
-        long pageSize = 20L;
-        long pageNo = 1L;
+        long pageSize;
+        long pageNo;
+        if (ObjectUtil.isNull(req.getPageNo())){
+            pageNo = 1L;
+        }else {
+            pageNo= req.getPageNo();
+        }
+        if ( ObjectUtil.isNull(req.getPageSize())){
+            pageSize = 20L;
+        }else {
+            pageSize= req.getPageSize();
+        }
         Page<InventorySummary> page = new Page<>(pageNo,pageSize);
         IPage<InventorySummary> pages= inventoryMapper.AreaInventoryPage(page,req.getId());
         page.setRecords(pages.getRecords());