diff --git a/chaos_api_service/src/main/java/cn/nopj/chaos_api/service/impl/DeviceTypeServiceImpl.java b/chaos_api_service/src/main/java/cn/nopj/chaos_api/service/impl/DeviceTypeServiceImpl.java index 4295cf3..dbe82e7 100644 --- a/chaos_api_service/src/main/java/cn/nopj/chaos_api/service/impl/DeviceTypeServiceImpl.java +++ b/chaos_api_service/src/main/java/cn/nopj/chaos_api/service/impl/DeviceTypeServiceImpl.java @@ -28,12 +28,11 @@ public class DeviceTypeServiceImpl extends ServiceImpl getDeviceTypeOptions() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - - return this.lambdaQuery() .select(DeviceType::getId, DeviceType::getName) - //todo - - ; + .list() + .stream() + .map(deviceType -> new OptionResponse(deviceType.getName(), deviceType.getId().toString())) + .toList(); } } diff --git a/chaos_api_web/src/main/java/cn/nopj/chaos_api/controller/DeviceTypeController.java b/chaos_api_web/src/main/java/cn/nopj/chaos_api/controller/DeviceTypeController.java index 45eed27..6592acf 100644 --- a/chaos_api_web/src/main/java/cn/nopj/chaos_api/controller/DeviceTypeController.java +++ b/chaos_api_web/src/main/java/cn/nopj/chaos_api/controller/DeviceTypeController.java @@ -34,6 +34,10 @@ public class DeviceTypeController { return ApiResult.success(deviceTypeService.getAllDeviceTypes()); } + /** + * 获取所有设备类型选项 + * @return 所有设备类型选项 + */ @GetMapping("/options") public ApiResult> getDeviceTypeOptions() { return ApiResult.success(deviceTypeService.getDeviceTypeOptions());