diff --git a/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java b/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java index caf2589..a5a1576 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java @@ -23,7 +23,7 @@ public class ChannelController { @Autowired private ChannelService channelService; - @GetMapping + @GetMapping("/list") @Operation(summary = "获取list数据") public Result> getAll() { return Result.success(channelService.list()); diff --git a/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java b/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java index b1eadf3..f169c79 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java @@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Objects; + /** * 配方 */ @@ -59,4 +61,17 @@ public class FormulationController { return flag? Result.success("删除成功") : Result.failed("删除失败"); } + @GetMapping("/concentration/{id}") + @Operation(summary = "根据ID获取浓度") + public Result> getConcentration(@PathVariable Integer id) { + List formulations=formulationService.list(new LambdaQueryWrapper().eq(Formulation::getSolutionId, id)); + if (formulations != null && !formulations.isEmpty()) { + return Result.success(formulations.stream().map(Formulation::getConcentration).filter(Objects::nonNull) // 过滤掉null值 + .distinct() + .toList()); + } + return null; + } + + } diff --git a/src/main/java/com/iflytop/handacid/app/controller/SolutionController.java b/src/main/java/com/iflytop/handacid/app/controller/SolutionController.java index 7294013..4d9d498 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/SolutionController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/SolutionController.java @@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import java.util.Arrays; +import java.util.List; @Tag(name = "\uD83D\uDCA7溶液接口") @RestController @@ -25,11 +26,17 @@ public class SolutionController { private final SolutionService solutionsService; @Operation(summary = "分页查询溶液") - @PostMapping("/list") - public PageResult list(@RequestBody BasePageQuery query) { + @PostMapping("/page") + public PageResult getPage(@RequestBody BasePageQuery query) { return PageResult.success(solutionsService.page(new Page<>(query.getPageNum(), query.getPageSize()))); } + @Operation(summary = "溶液下拉选") + @GetMapping("/list") + public Result> getList() { + return Result.success(solutionsService.list()); + } + @Operation(summary = "添加溶液") @PostMapping("") public Result add(@Valid @RequestBody Solution solutions) { diff --git a/src/main/java/com/iflytop/handacid/app/controller/SystemConfigController.java b/src/main/java/com/iflytop/handacid/app/controller/SystemConfigController.java index c63d5f7..9719cf7 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/SystemConfigController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/SystemConfigController.java @@ -25,8 +25,8 @@ public class SystemConfigController { private final SystemConfigService systemConfigService; @Operation(summary = "分页查询系统配置") - @PostMapping("/list") - public PageResult list(@RequestBody BasePageQuery query) { + @PostMapping("/page") + public PageResult getList(@RequestBody BasePageQuery query) { return PageResult.success(systemConfigService.page(new Page<>(query.getPageNum(), query.getPageSize()))); } diff --git a/src/main/java/com/iflytop/handacid/app/controller/SystemLogController.java b/src/main/java/com/iflytop/handacid/app/controller/SystemLogController.java index aba0789..a24884b 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/SystemLogController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/SystemLogController.java @@ -26,7 +26,7 @@ public class SystemLogController { @Operation(summary = "分页查询系统日志") @PostMapping("/list") - public PageResult list(@RequestBody BasePageQuery query) { + public PageResult getList(@RequestBody BasePageQuery query) { return PageResult.success(systemLogService.page(new Page<>(query.getPageNum(), query.getPageSize()))); } diff --git a/src/main/java/com/iflytop/handacid/app/controller/UserController.java b/src/main/java/com/iflytop/handacid/app/controller/UserController.java index 79137da..203d257 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/UserController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/UserController.java @@ -26,8 +26,8 @@ public class UserController { private final UserService userService; @Operation(summary = "分页查询用户列表") - @PostMapping("/list") - public PageResult list(@RequestBody BasePageQuery query) { + @PostMapping("/page") + public PageResult getPage(@RequestBody BasePageQuery query) { Page page = new Page<>(query.getPageNum(), query.getPageSize()); return PageResult.success(userService.page(page)); }