diff --git a/pom.xml b/pom.xml index a894b0c..2ea1eeb 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ food-hub-service - 0.0.1-SNAPSHOT + 0.0.1 food-hub-service food-hub-service @@ -38,4 +38,13 @@ 2.0.0 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/src/main/java/com/cxx/food/config/WebMvcConfig.java b/src/main/java/com/cxx/food/config/WebMvcConfig.java new file mode 100644 index 0000000..8a4c8a5 --- /dev/null +++ b/src/main/java/com/cxx/food/config/WebMvcConfig.java @@ -0,0 +1,23 @@ +package com.cxx.food.config; + +import com.cxx.food.constant.FileConstant; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + @Value("${file.path}") + private String filePath; + + @Value("${file.log-path}") + private String logFilePath; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/" + FileConstant.FILE_URL_PREFIX + "/**") + .addResourceLocations("file:" + filePath); + } +} + diff --git a/src/main/java/com/cxx/food/constant/FileConstant.java b/src/main/java/com/cxx/food/constant/FileConstant.java new file mode 100644 index 0000000..0a354bf --- /dev/null +++ b/src/main/java/com/cxx/food/constant/FileConstant.java @@ -0,0 +1,7 @@ +package com.cxx.food.constant; + +public interface FileConstant { + String FILE_NAME_SPLIT = "_"; + String FILE_URL_PREFIX = "files"; + String FILE_LOG_PREFIX = "logs"; +} diff --git a/src/main/java/com/cxx/food/controller/FoodController.java b/src/main/java/com/cxx/food/controller/FoodController.java index 9f677dd..1c0a701 100644 --- a/src/main/java/com/cxx/food/controller/FoodController.java +++ b/src/main/java/com/cxx/food/controller/FoodController.java @@ -39,12 +39,18 @@ public class FoodController { return foodService.deleteFoodRecipe(id); } + @Operation(summary = "查询美食菜谱") + @GetMapping("/recipe") + public List queryFoodSummary(FoodQueryVo foodQueryVo) { + return foodService.queryFoodSummary(foodQueryVo); + } + @Operation(summary = "分页查询美食菜谱") @GetMapping("/recipe/page") - public IPage queryFoodSummary(@RequestParam("currentPage") Integer currentPage, - @RequestParam("pageSize") Integer pageSize, - FoodQueryVo foodQueryVo) { - return foodService.queryFoodSummary(currentPage, pageSize, foodQueryVo); + public IPage queryFoodSummaryByPage(@RequestParam("currentPage") Integer currentPage, + @RequestParam("pageSize") Integer pageSize, + FoodQueryVo foodQueryVo) { + return foodService.queryFoodSummaryByPage(currentPage, pageSize, foodQueryVo); } @Operation(summary = "查询美食") @@ -96,5 +102,23 @@ public class FoodController { public FoodStatsDto queryFoodStats() { return foodService.queryFoodStats(); } + + @Operation(summary = "查询美食记录统计") + @GetMapping("/stats/record") + public List queryFoodRecordStats() { + return foodService.queryFoodRecordStats(); + } + + @Operation(summary = "查询美食类别统计") + @GetMapping("/stats/category") + public List queryFoodCategoryStats() { + return foodService.queryFoodCategoryStats(); + } + + @Operation(summary = "查询美食排行榜统计") + @GetMapping("/stats/rank") + public List queryFoodRankStats() { + return foodService.queryFoodRankStats(); + } } \ No newline at end of file diff --git a/src/main/java/com/cxx/food/dao/FoodDao.java b/src/main/java/com/cxx/food/dao/FoodDao.java index e197b44..920503e 100644 --- a/src/main/java/com/cxx/food/dao/FoodDao.java +++ b/src/main/java/com/cxx/food/dao/FoodDao.java @@ -12,8 +12,10 @@ import java.util.List; public interface FoodDao { FoodRecipeDto queryFoodRecipe(@Param("id") Long id); - IPage queryFoodSummary(IPage page, - @Param("query") FoodQueryVo foodQueryVo); + IPage queryFoodSummaryByPage(IPage page, + @Param("query") FoodQueryVo foodQueryVo); + + List queryFoodSummary(@Param("query") FoodQueryVo foodQueryVo); List queryFoodRecordById(@Param("id") Long id); @@ -22,6 +24,12 @@ public interface FoodDao { FoodStatsDto queryFoodStats(); + List queryFoodRecordStats(); + + List queryFoodCategoryStats(); + + List queryFoodRankStats(); + List queryFoodCategory(); void insertFoodMaterial(@Param("foodId") Long foodId, diff --git a/src/main/java/com/cxx/food/dto/FoodRecordDto.java b/src/main/java/com/cxx/food/dto/FoodRecordDto.java index dc726c6..dbd9483 100644 --- a/src/main/java/com/cxx/food/dto/FoodRecordDto.java +++ b/src/main/java/com/cxx/food/dto/FoodRecordDto.java @@ -23,6 +23,10 @@ public class FoodRecordDto { @JsonView(ReadView.class) private String category; + @Schema(description = "完成人") + @JsonView(ReadView.class) + private Long person; + @Schema(description = "完成时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date date; diff --git a/src/main/java/com/cxx/food/dto/StatsChartDto.java b/src/main/java/com/cxx/food/dto/StatsChartDto.java new file mode 100644 index 0000000..2afaa5e --- /dev/null +++ b/src/main/java/com/cxx/food/dto/StatsChartDto.java @@ -0,0 +1,11 @@ +package com.cxx.food.dto; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class StatsChartDto { + private String name; + private Double value; +} diff --git a/src/main/java/com/cxx/food/entity/FoodRecord.java b/src/main/java/com/cxx/food/entity/FoodRecord.java index 09b5846..9cc0b26 100644 --- a/src/main/java/com/cxx/food/entity/FoodRecord.java +++ b/src/main/java/com/cxx/food/entity/FoodRecord.java @@ -15,6 +15,9 @@ public class FoodRecord extends AbstractIdEntity { @TableField("food_id") private Long foodId; + @TableField("person") + private Long person; + @TableField("date") private Date date; diff --git a/src/main/java/com/cxx/food/service/FoodService.java b/src/main/java/com/cxx/food/service/FoodService.java index a65de7a..0c0503b 100644 --- a/src/main/java/com/cxx/food/service/FoodService.java +++ b/src/main/java/com/cxx/food/service/FoodService.java @@ -2,10 +2,7 @@ package com.cxx.food.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cxx.food.dto.FoodRecipeDto; -import com.cxx.food.dto.FoodRecordDto; -import com.cxx.food.dto.FoodStatsDto; -import com.cxx.food.dto.FoodSummaryDto; +import com.cxx.food.dto.*; import com.cxx.food.vo.FoodQueryVo; import java.util.List; @@ -25,7 +22,9 @@ public interface FoodService { FoodRecipeDto queryFoodRecipe(Long id); - IPage queryFoodSummary(Integer currentPage, Integer pageSize, FoodQueryVo foodQueryVo); + List queryFoodSummary(FoodQueryVo foodQueryVo); + + IPage queryFoodSummaryByPage(Integer currentPage, Integer pageSize, FoodQueryVo foodQueryVo); List queryFoodRecord(String startDate, String endDate); @@ -34,4 +33,10 @@ public interface FoodService { List queryFoodCategory(); FoodStatsDto queryFoodStats(); + + List queryFoodRecordStats(); + + List queryFoodCategoryStats(); + + List queryFoodRankStats(); } diff --git a/src/main/java/com/cxx/food/service/impl/FoodServiceImpl.java b/src/main/java/com/cxx/food/service/impl/FoodServiceImpl.java index a0134fd..7373b45 100644 --- a/src/main/java/com/cxx/food/service/impl/FoodServiceImpl.java +++ b/src/main/java/com/cxx/food/service/impl/FoodServiceImpl.java @@ -163,11 +163,16 @@ public class FoodServiceImpl implements FoodService { } @Override - public IPage queryFoodSummary(Integer currentPage, Integer pageSize, FoodQueryVo foodQueryVo) { + public List queryFoodSummary(FoodQueryVo foodQueryVo) { + return foodDao.queryFoodSummary(foodQueryVo); + } + + @Override + public IPage queryFoodSummaryByPage(Integer currentPage, Integer pageSize, FoodQueryVo foodQueryVo) { // 这里只能先对主表进行分页 然后在查询子表信息 // 不能使用Left Join关联表查询，因为这里是一对多数据，关联查询会导致数据有重复 // 从而导致page计算错误（会把重复的数据当成多条记录，实际上只有1条记录） - IPage foodSummaryPage = foodDao.queryFoodSummary(new Page<>(currentPage, pageSize), foodQueryVo); + IPage foodSummaryPage = foodDao.queryFoodSummaryByPage(new Page<>(currentPage, pageSize), foodQueryVo); List foodSummaryList = foodSummaryPage.getRecords(); for (FoodSummaryDto foodSummary : foodSummaryList) { foodSummary.setRecordList(foodDao.queryFoodRecordById(foodSummary.getId())); @@ -197,4 +202,19 @@ public class FoodServiceImpl implements FoodService { public FoodStatsDto queryFoodStats() { return foodDao.queryFoodStats(); } + + @Override + public List queryFoodRecordStats() { + return foodDao.queryFoodRecordStats(); + } + + @Override + public List queryFoodCategoryStats() { + return foodDao.queryFoodCategoryStats(); + } + + @Override + public List queryFoodRankStats() { + return foodDao.queryFoodRankStats(); + } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 82d908c..2da027c 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/food_hub?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: cxx password: 123456 diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml index dafb638..1ea4742 100644 --- a/src/main/resources/application-docker.yml +++ b/src/main/resources/application-docker.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://mysql:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://mysql:3306/food_hub?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: docker password: 19940822Cxx diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 0bdcd3b..7a42cbe 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/food_hub?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: cxx password: 19940822Cxx@1213 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3bb8bc7..9c560d5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8090 + port: 8100 spring: application: diff --git a/src/main/resources/dump-food_hub-202506242001.sql b/src/main/resources/dump-food_hub-202506242001.sql deleted file mode 100644 index 4f1820a..0000000 --- a/src/main/resources/dump-food_hub-202506242001.sql +++ /dev/null @@ -1,142 +0,0 @@ --- MySQL dump 10.13 Distrib 8.0.26, for Win64 (x86_64) --- --- Host: localhost Database: food_hub --- ------------------------------------------------------ --- Server version 8.0.27 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `food_material` --- - -DROP TABLE IF EXISTS `food_material`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `food_material` ( - `id` bigint NOT NULL, - `food_id` bigint NOT NULL COMMENT '美食id', - `type` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型', - `name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `amount` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '分量', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='美食食材'; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `food_material` --- - -LOCK TABLES `food_material` WRITE; -/*!40000 ALTER TABLE `food_material` DISABLE KEYS */; -INSERT INTO `food_material` VALUES (632688264339525,614660173221957,'主料','胖头鱼','一个'),(632688264339526,614660173221957,'辅料','豆腐','一块'),(632688264339527,614660173221957,'调料','生姜','少许'),(632688264339528,614660173221957,'调料','料酒','少许'),(632701463908421,614665900060741,'主料','带鱼','2条'),(632702438854725,614668663291973,'主料','砺岈','100克'),(632703259131973,632703259000901,'主料','鲫鱼','1斤'),(636430940057669,632703747838021,'主料','土豆','1个'),(672333164245061,672333164216389,'主料','鸡蛋','1个'),(672333288312901,672333288300613,'主料','大虾','1斤'),(672333596311621,672333596299333,'主料','鲳鳊鱼','1条'),(672333773520965,672333773504581,'主料','大白菜','1颗'); -/*!40000 ALTER TABLE `food_material` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `food_recipe` --- - -DROP TABLE IF EXISTS `food_recipe`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `food_recipe` ( - `id` bigint NOT NULL, - `name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '美食名称', - `category` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '美食菜系', - `recommend_rate` int DEFAULT NULL COMMENT '推荐指数', - `remark` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新人', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='美食记录'; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `food_recipe` --- - -LOCK TABLES `food_recipe` WRITE; -/*!40000 ALTER TABLE `food_recipe` DISABLE KEYS */; -INSERT INTO `food_recipe` VALUES (614660173221957,'鱼头汤','淮扬菜',5,'','2024-11-21 22:38:41',NULL,'2025-01-11 21:15:10',NULL),(614665900060741,'红烧带鱼','闽菜',5,'','2024-11-21 23:01:59',NULL,'2025-01-11 22:08:53',NULL),(614668663291973,'砺岈饼','其他',0,'','2024-11-21 23:13:14',NULL,'2025-01-11 22:12:51',NULL),(632703259000901,'红烧鲫鱼','其他',0,'','2025-01-11 22:16:11',NULL,'2025-01-11 22:16:11',NULL),(632703747838021,'青椒土豆丝','家常菜',0,'','2025-01-11 22:18:10',NULL,'2025-01-22 11:04:09',NULL),(672333164216389,'香煎荷包蛋','家常菜',4,'','2025-05-03 21:50:41','645808454946885','2025-05-03 21:50:41','645808454946885'),(672333288300613,'红烧大虾','家常菜',5,'','2025-05-03 21:51:11','645808454946885','2025-05-03 21:51:11','645808454946885'),(672333596299333,'红烧鲳鳊鱼','家常菜',4,'','2025-05-03 21:52:26','645808454946885','2025-05-03 21:52:26','645808454946885'),(672333773504581,'清炒大白菜','家常菜',4,'','2025-05-03 21:53:10','645808454946885','2025-05-03 21:53:10','645808454946885'); -/*!40000 ALTER TABLE `food_recipe` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `food_record` --- - -DROP TABLE IF EXISTS `food_record`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `food_record` ( - `id` bigint NOT NULL, - `food_id` bigint NOT NULL COMMENT '美食id', - `date` date NOT NULL COMMENT '完成时间', - `image_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图片路径', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='美食成果'; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `food_record` --- - -LOCK TABLES `food_record` WRITE; -/*!40000 ALTER TABLE `food_record` DISABLE KEYS */; -INSERT INTO `food_record` VALUES (632688264441925,614660173221957,'2025-01-04','files/food/487f7b22f68312d2c1bbc93b1aea445b.jpg'),(632688264441926,614660173221957,'2024-11-13','files/food/afa87f8628b21f883c0df8e8fa191f54.jpg'),(632701463998533,614665900060741,'2025-01-05','files/food/59c704e85c1f7a92060cecbd01285ff3.jpg'),(632702438899781,614668663291973,'2025-01-04','files/food/08398ad34a09075dd1ba10ebd2776268.jpg'),(632703259230277,632703259000901,'2024-12-01','files/food/a5a8a1ccb111e2f0a91512efbfcdb04c.jpg'),(632703748022341,632703747838021,'2025-01-04','files/food/2b9fb91718567ffbce3345498f07a567.jpg'),(672332969476165,614660173221957,'2025-05-03','files/food/1bcaa7cff0162df2268147b18c1d8cdc.jpg'),(672334043287621,672333596299333,'2025-02-16','files/food/15ce1a86f4a2e6fb96c17bb307f36455.jpg'),(672334159204421,672333773504581,'2025-02-16','files/food/9e7c0cd1cbd0de61dce1c5c053e5ed62.jpg'),(672334513164357,672333288300613,'2025-04-06','files/food/a84730dc6f7f025205d984ebfdb222f2.jpg'),(672334634389573,672333164216389,'2025-04-06','files/food/afc9e6d770ae83e030362e6758373398.jpg'); -/*!40000 ALTER TABLE `food_record` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `food_step` --- - -DROP TABLE IF EXISTS `food_step`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `food_step` ( - `id` bigint NOT NULL, - `food_id` bigint NOT NULL COMMENT '美食id', - `sort` int NOT NULL COMMENT '顺序', - `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容', - `image_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图片地址', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='美食步骤'; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `food_step` --- - -LOCK TABLES `food_step` WRITE; -/*!40000 ALTER TABLE `food_step` DISABLE KEYS */; -INSERT INTO `food_step` VALUES (632688264384581,614660173221957,0,'先把鱼头剁开',''),(632688264384582,614660173221957,1,'洗鱼',''),(632688264384583,614660173221957,2,'倒水放砂锅里煮',''),(632688264384584,614660173221957,3,'放豆腐',''),(632688264384585,614660173221957,4,'放盐',''),(632701463953477,614665900060741,0,'清洗带鱼',''),(632702438879301,614668663291973,0,'清洗砺岈',''),(632703259185221,632703259000901,0,'清洗鲫鱼',''),(636430940074053,632703747838021,0,'清洗土豆切成丝',''); -/*!40000 ALTER TABLE `food_step` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping routines for database 'food_hub' --- -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2025-06-24 20:01:31 diff --git a/src/main/resources/mapper/FoodMapper.xml b/src/main/resources/mapper/FoodMapper.xml index e360486..039d8d8 100644 --- a/src/main/resources/mapper/FoodMapper.xml +++ b/src/main/resources/mapper/FoodMapper.xml @@ -34,6 +34,7 @@ + @@ -45,8 +46,8 @@ + - @@ -72,6 +73,7 @@ - SELECT a.id AS id, a.name AS name, a.category AS category, @@ -115,6 +118,23 @@ + + + + + + + +