diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java index cfef146..25f3674 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java @@ -1,5 +1,6 @@ package com.storeroom.modules.archives.controller; +import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.utils.enums.ResponseStatus; import com.storeroom.modules.archives.service.ArchivesCaseService; import com.storeroom.modules.archives.service.dto.ArchivesCaseCartoningDTO; @@ -30,6 +31,14 @@ public class CaseController { return ApiResponse.success(caseService.initCaseList(tid,caseName,barcode,page)); } + @ApiOperation("获取全部档案盒") + @AnonymousGetMapping("/initCaseAll") + public ApiResponse initCaseAll( + Pageable page + ){ + return ApiResponse.success(caseService.initCaseAll(page)); + } + @ApiOperation("档案盒名称是否重复") @GetMapping("/caseNameIsRepeat") public ApiResponse caseNameIsRepeat( diff --git a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java index 0073ca8..e96bbb9 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java @@ -37,4 +37,10 @@ public class DeviceController { } return ApiResponse.success(deviceService.queryAll(pageable)); } + + @ApiOperation("获取储存设备列表") + @AnonymousGetMapping("storageDevice") + public ApiResponse storageDevice(Pageable pageable) { + return ApiResponse.success(deviceService.queryStorageDeviceAll(pageable)); + } } diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java b/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java index aa91ef7..552019b 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java @@ -122,5 +122,7 @@ public interface DeviceService { */ DeviceInfoDto findById(String id); + //获取储存设备列表 + Object queryStorageDeviceAll(Pageable pageable); } diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java index 19e11fb..dc0d941 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java @@ -305,6 +305,12 @@ public class DeviceImpl implements DeviceService { return deviceInfoMapper.toDto(deviceInfo); } + @Override + public Object queryStorageDeviceAll(Pageable pageable) { + Page page = deviceInfoRepository.queryStorageDeviceAll(pageable); + return PageUtil.toPage(page.map(deviceInfoMapper::toDto)); + } + /** * 生成架位左右位置