diff --git a/home-service/src/main/java/com/cxx/home/controller/FoodController.java b/home-service/src/main/java/com/cxx/home/controller/FoodController.java index c3229c0..7f3faa2 100644 --- a/home-service/src/main/java/com/cxx/home/controller/FoodController.java +++ b/home-service/src/main/java/com/cxx/home/controller/FoodController.java @@ -52,6 +52,12 @@ public class FoodController { return foodService.queryFoodSummary(currentPage, pageSize, foodQueryVo); } + @Operation(summary = "搜索美食") + @GetMapping("/recipe/search") + public FoodSummaryDto searchFood(@RequestParam("name") String name) { + return foodService.searchFood(name); + } + @Operation(summary = "查询美食") @GetMapping("/recipe/{id}") public @JsonView(ReadView.class) FoodRecipeDto queryFoodRecipe(@PathVariable("id") long id) { @@ -60,8 +66,8 @@ public class FoodController { @Operation(summary = "查询所有美食名称") @GetMapping("/recipe/name") - public List queryFoodName() { - return foodService.queryFoodName(); + public List queryFoodNameList() { + return foodService.queryFoodNameList(); } @Operation(summary = "新增美食成果") diff --git a/home-service/src/main/java/com/cxx/home/dao/FoodDao.java b/home-service/src/main/java/com/cxx/home/dao/FoodDao.java index a6c3343..17f894b 100644 --- a/home-service/src/main/java/com/cxx/home/dao/FoodDao.java +++ b/home-service/src/main/java/com/cxx/home/dao/FoodDao.java @@ -15,6 +15,8 @@ public interface FoodDao { IPage queryFoodSummary(IPage page, @Param("query") FoodQueryVo foodQueryVo); + FoodSummaryDto searchFoodSummary(@Param("name") String name); + List queryFoodRecordById(@Param("id") Long id); List queryFoodRecord(@Param("startDate") String startDate, diff --git a/home-service/src/main/java/com/cxx/home/service/FoodService.java b/home-service/src/main/java/com/cxx/home/service/FoodService.java index 9ea1fd5..2ac8222 100644 --- a/home-service/src/main/java/com/cxx/home/service/FoodService.java +++ b/home-service/src/main/java/com/cxx/home/service/FoodService.java @@ -27,9 +27,11 @@ public interface FoodService { IPage queryFoodSummary(Integer currentPage, Integer pageSize, FoodQueryVo foodQueryVo); + FoodSummaryDto searchFood(String name); + List queryFoodRecord(String startDate, String endDate); - List queryFoodName(); + List queryFoodNameList(); List queryFoodCategory(); diff --git a/home-service/src/main/java/com/cxx/home/service/impl/FoodServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/FoodServiceImpl.java index 5315dd5..9c96027 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/FoodServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/FoodServiceImpl.java @@ -1,6 +1,5 @@ package com.cxx.home.service.impl; -import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -187,13 +186,20 @@ public class FoodServiceImpl implements FoodService { return foodSummaryPage; } + @Override + public FoodSummaryDto searchFood(String name) { + FoodSummaryDto foodSummaryDto = foodDao.searchFoodSummary(name); + foodSummaryDto.setRecordList(foodDao.queryFoodRecordById(foodSummaryDto.getId())); + return foodSummaryDto; + } + @Override public List queryFoodRecord(String startDate, String endDate) { return foodDao.queryFoodRecord(startDate, endDate); } @Override - public List queryFoodName() { + public List queryFoodNameList() { return foodRecipeMapper.selectList(Wrappers.emptyWrapper()) .stream().map(FoodRecipe::getName).collect(Collectors.toList()); } diff --git a/home-service/src/main/resources/mapper/FoodMapper.xml b/home-service/src/main/resources/mapper/FoodMapper.xml index dff3f48..e916f38 100644 --- a/home-service/src/main/resources/mapper/FoodMapper.xml +++ b/home-service/src/main/resources/mapper/FoodMapper.xml @@ -119,6 +119,16 @@ ORDER BY a.create_time DESC + +