diff --git a/src/main/java/github/benjamin/equipreservebackend/constant/DeviceReservationState.java b/src/main/java/github/benjamin/equipreservebackend/constant/DeviceReservationState.java index a92aeb2..9bbdb5a 100644 --- a/src/main/java/github/benjamin/equipreservebackend/constant/DeviceReservationState.java +++ b/src/main/java/github/benjamin/equipreservebackend/constant/DeviceReservationState.java @@ -5,7 +5,7 @@ import lombok.Getter; @Getter public enum DeviceReservationState { - FREE("可预约"), + FREE("空闲"), RESERVED("有预约"); private final String label; diff --git a/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java b/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java index 20a4cc7..e9112bf 100644 --- a/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java +++ b/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java @@ -22,9 +22,10 @@ public class DeviceController { @PreAuthorize("hasRole('USER')") @GetMapping public ResponseResult> getDevices(@RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size) { + @RequestParam(defaultValue = "10") Integer size, + @RequestParam(required = false) String name) { Page pageRequest = new Page<>(page, size); - Page res = deviceService.getDeviceVO(pageRequest); + Page res = deviceService.getDeviceVO(pageRequest, name); return ResponseResult.success(res); } diff --git a/src/main/java/github/benjamin/equipreservebackend/service/DeviceService.java b/src/main/java/github/benjamin/equipreservebackend/service/DeviceService.java index d32b351..42afcab 100644 --- a/src/main/java/github/benjamin/equipreservebackend/service/DeviceService.java +++ b/src/main/java/github/benjamin/equipreservebackend/service/DeviceService.java @@ -8,7 +8,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; public interface DeviceService { - Page getDeviceVO(Page pageRequest); + Page getDeviceVO(Page pageRequest, String name); void addDevice(Device device); diff --git a/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java b/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java index ca1313a..903a6b7 100644 --- a/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java +++ b/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java @@ -38,10 +38,14 @@ public class DeviceServiceImpl implements DeviceService { private final ReservationService reservationService; @Override - public Page getDeviceVO(Page pageRequest) { - Page devices = deviceMapper.selectPage(pageRequest, new LambdaQueryWrapper() + public Page getDeviceVO(Page pageRequest, String name) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(Device::getStatus, DeviceStatus.AVAILABLE) - .orderByAsc(Device::getName)); + .orderByAsc(Device::getName); + if (StringUtils.hasText(name)) { + queryWrapper.like(Device::getName, name); + } + Page devices = deviceMapper.selectPage(pageRequest,queryWrapper); List deviceIds = devices.getRecords().stream() .map(Device::getId) .toList();