From e223fbb1a8a4e7e00087d636098d74615ddef611 Mon Sep 17 00:00:00 2001 From: slhaf <2998813882@qq.com> Date: Thu, 12 Sep 2024 20:02:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A5=97=E9=A4=90=E3=80=81?= =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E3=80=81?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=88=86=E7=B1=BBid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=8F=9C=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sky/aspect/AutoFillAspect.java | 1 - .../java/com/sky/config/OSSConfiguration.java | 1 - .../com/sky/config/WebMvcConfiguration.java | 1 - .../controller/admin/CommonController.java | 1 - .../sky/controller/admin/DishController.java | 14 +++++ .../controller/admin/SetmealController.java | 48 ++++++++++++++++ .../interceptor/JwtTokenAdminInterceptor.java | 1 + .../main/java/com/sky/mapper/DishMapper.java | 9 ++- .../java/com/sky/mapper/EmployeeMapper.java | 1 - .../com/sky/mapper/SetmealDishMapper.java | 3 + .../java/com/sky/mapper/SetmealMapper.java | 9 +++ .../java/com/sky/service/DishService.java | 8 +++ .../java/com/sky/service/SetmealService.java | 22 +++++++ .../sky/service/impl/CategoryServiceImpl.java | 6 +- .../com/sky/service/impl/DishServiceImpl.java | 11 +++- .../sky/service/impl/EmployeeServiceImpl.java | 2 - .../sky/service/impl/SetmealServiceImpl.java | 57 +++++++++++++++++++ .../resources/mapper/SetmealDishMapper.xml | 7 +++ .../main/resources/mapper/SetmealMapper.xml | 21 +++++++ 19 files changed, 209 insertions(+), 14 deletions(-) create mode 100644 sky-server/src/main/java/com/sky/controller/admin/SetmealController.java create mode 100644 sky-server/src/main/java/com/sky/service/SetmealService.java create mode 100644 sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java create mode 100644 sky-server/src/main/resources/mapper/SetmealMapper.xml diff --git a/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java b/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java index 21deec4..83ecc76 100644 --- a/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java +++ b/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java @@ -6,7 +6,6 @@ import com.sky.context.BaseContext; import com.sky.enumeration.OperationType; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.Signature; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; diff --git a/sky-server/src/main/java/com/sky/config/OSSConfiguration.java b/sky-server/src/main/java/com/sky/config/OSSConfiguration.java index 9b3336a..df57752 100644 --- a/sky-server/src/main/java/com/sky/config/OSSConfiguration.java +++ b/sky-server/src/main/java/com/sky/config/OSSConfiguration.java @@ -5,7 +5,6 @@ import com.sky.utils.AliOssUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; /** diff --git a/sky-server/src/main/java/com/sky/config/WebMvcConfiguration.java b/sky-server/src/main/java/com/sky/config/WebMvcConfiguration.java index 406ae02..7786255 100644 --- a/sky-server/src/main/java/com/sky/config/WebMvcConfiguration.java +++ b/sky-server/src/main/java/com/sky/config/WebMvcConfiguration.java @@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; diff --git a/sky-server/src/main/java/com/sky/controller/admin/CommonController.java b/sky-server/src/main/java/com/sky/controller/admin/CommonController.java index 0f6bd7e..1c6e731 100644 --- a/sky-server/src/main/java/com/sky/controller/admin/CommonController.java +++ b/sky-server/src/main/java/com/sky/controller/admin/CommonController.java @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; diff --git a/sky-server/src/main/java/com/sky/controller/admin/DishController.java b/sky-server/src/main/java/com/sky/controller/admin/DishController.java index 048f3d0..985d040 100644 --- a/sky-server/src/main/java/com/sky/controller/admin/DishController.java +++ b/sky-server/src/main/java/com/sky/controller/admin/DishController.java @@ -2,6 +2,7 @@ package com.sky.controller.admin; import com.sky.dto.DishDTO; import com.sky.dto.DishPageQueryDTO; +import com.sky.entity.Dish; import com.sky.result.PageResult; import com.sky.result.Result; import com.sky.service.DishService; @@ -89,4 +90,17 @@ public class DishController { dishService.updateWithFlavor(dishDTO); return Result.success(); } + + /** + * 根据分类id查询菜品 + * @param categoryId + * @return + */ + @GetMapping("/list") + @ApiOperation("根据分类id查询菜品") + public Result list(String categoryId){ + log.info("根据分类id查询菜品: {}",categoryId); + List dishes = dishService.selectByCategoryId(categoryId); + return Result.success(dishes); + } } diff --git a/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java b/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java new file mode 100644 index 0000000..7187e95 --- /dev/null +++ b/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java @@ -0,0 +1,48 @@ +package com.sky.controller.admin; + +import com.sky.dto.SetmealDTO; +import com.sky.dto.SetmealPageQueryDTO; +import com.sky.result.PageResult; +import com.sky.result.Result; +import com.sky.service.SetmealService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/admin/setmeal") +@Slf4j +@Api(tags = "套餐相关接口") +public class SetmealController { + + @Autowired + private SetmealService setmealService; + + /** + * 套餐分页查询 + * @param setmealPageQueryDTO + * @return + */ + @GetMapping("/page") + @ApiOperation("套餐分页查询") + public Result pageQuery(SetmealPageQueryDTO setmealPageQueryDTO){ + log.info("套餐分页查询: {}",setmealPageQueryDTO); + PageResult pageResult = setmealService.pageQuery(setmealPageQueryDTO); + return Result.success(pageResult); + } + + /** + * 新增套餐 + * @param setmealDTO + * @return + */ + @PostMapping + @ApiOperation("新增套餐") + public Result insert(@RequestBody SetmealDTO setmealDTO){ + log.info("新增套餐: {}",setmealDTO); + setmealService.insert(setmealDTO); + return Result.success(); + } +} diff --git a/sky-server/src/main/java/com/sky/interceptor/JwtTokenAdminInterceptor.java b/sky-server/src/main/java/com/sky/interceptor/JwtTokenAdminInterceptor.java index e7ca98f..f9eaf67 100644 --- a/sky-server/src/main/java/com/sky/interceptor/JwtTokenAdminInterceptor.java +++ b/sky-server/src/main/java/com/sky/interceptor/JwtTokenAdminInterceptor.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/sky-server/src/main/java/com/sky/mapper/DishMapper.java b/sky-server/src/main/java/com/sky/mapper/DishMapper.java index d3afb20..0df9171 100644 --- a/sky-server/src/main/java/com/sky/mapper/DishMapper.java +++ b/sky-server/src/main/java/com/sky/mapper/DishMapper.java @@ -7,7 +7,6 @@ import com.sky.entity.Dish; import com.sky.enumeration.OperationType; import com.sky.vo.DishVO; import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -61,4 +60,12 @@ public interface DishMapper { @AutoFill(OperationType.UPDATE) void update(Dish dish); + + /** + * 根据分类id查询菜品 + * @param categoryId + * @return + */ + @Select("select * from dish where category_id = #{categoryId}") + List selectByCategoryId(String categoryId); } diff --git a/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java b/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java index fe683f6..137d85e 100644 --- a/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java +++ b/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java @@ -8,7 +8,6 @@ import com.sky.enumeration.OperationType; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; -import org.springframework.stereotype.Service; @Mapper public interface EmployeeMapper { diff --git a/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java b/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java index 7051ec5..4d35de6 100644 --- a/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java +++ b/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java @@ -1,5 +1,6 @@ package com.sky.mapper; +import com.sky.entity.SetmealDish; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -12,4 +13,6 @@ public interface SetmealDishMapper { * @return */ List getSetmealIdsByDishIds(List ids); + + void insertBatch(List setmealDishes); } diff --git a/sky-server/src/main/java/com/sky/mapper/SetmealMapper.java b/sky-server/src/main/java/com/sky/mapper/SetmealMapper.java index 03cfee7..de6d99a 100644 --- a/sky-server/src/main/java/com/sky/mapper/SetmealMapper.java +++ b/sky-server/src/main/java/com/sky/mapper/SetmealMapper.java @@ -1,5 +1,10 @@ package com.sky.mapper; +import com.github.pagehelper.Page; +import com.sky.annotation.AutoFill; +import com.sky.dto.SetmealPageQueryDTO; +import com.sky.entity.Setmeal; +import com.sky.enumeration.OperationType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -14,4 +19,8 @@ public interface SetmealMapper { @Select("select count(id) from setmeal where category_id = #{categoryId}") Integer countByCategoryId(Long id); + Page pageQuery(SetmealPageQueryDTO setmealPageQueryDTO); + + @AutoFill(OperationType.INSERT) + void insert(Setmeal setmeal); } diff --git a/sky-server/src/main/java/com/sky/service/DishService.java b/sky-server/src/main/java/com/sky/service/DishService.java index 9f3e88f..046a25d 100644 --- a/sky-server/src/main/java/com/sky/service/DishService.java +++ b/sky-server/src/main/java/com/sky/service/DishService.java @@ -2,6 +2,7 @@ package com.sky.service; import com.sky.dto.DishDTO; import com.sky.dto.DishPageQueryDTO; +import com.sky.entity.Dish; import com.sky.result.PageResult; import com.sky.vo.DishVO; import org.springframework.stereotype.Service; @@ -42,4 +43,11 @@ public interface DishService { * @param dishDTO */ void updateWithFlavor(DishDTO dishDTO); + + /** + * 根据分类id查询菜品 + * @param categoryId + * @return + */ + List selectByCategoryId(String categoryId); } diff --git a/sky-server/src/main/java/com/sky/service/SetmealService.java b/sky-server/src/main/java/com/sky/service/SetmealService.java new file mode 100644 index 0000000..d2435e5 --- /dev/null +++ b/sky-server/src/main/java/com/sky/service/SetmealService.java @@ -0,0 +1,22 @@ +package com.sky.service; + +import com.sky.dto.SetmealDTO; +import com.sky.dto.SetmealPageQueryDTO; +import com.sky.result.PageResult; +import org.springframework.stereotype.Service; + +@Service +public interface SetmealService { + /** + * 套餐分页查询 + * @param setmealPageQueryDTO + * @return + */ + PageResult pageQuery(SetmealPageQueryDTO setmealPageQueryDTO); + + /** + * 新增套餐 + * @param setmealDTO + */ + void insert(SetmealDTO setmealDTO); +} diff --git a/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java index 0515baa..5bb0548 100644 --- a/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java +++ b/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java @@ -4,7 +4,6 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.sky.constant.MessageConstant; import com.sky.constant.StatusConstant; -import com.sky.context.BaseContext; import com.sky.dto.CategoryDTO; import com.sky.dto.CategoryPageQueryDTO; import com.sky.entity.Category; @@ -18,8 +17,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; -import java.util.Collections; import java.util.List; @Service @@ -129,7 +126,6 @@ public class CategoryServiceImpl implements CategoryService { */ @Override public List list(Integer type) { - List list = categoryMapper.selectByType(type); - return list; + return categoryMapper.selectByType(type); } } diff --git a/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java index 19f153d..7860472 100644 --- a/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java +++ b/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java @@ -22,7 +22,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.function.Consumer; @Service @Slf4j @@ -153,4 +152,14 @@ public class DishServiceImpl implements DishService { dishFlavorMapper.insertBatch(flavors); } } + + /** + * 根据分类id查询菜品 + * @param categoryId + * @return + */ + @Override + public List selectByCategoryId(String categoryId) { + return dishMapper.selectByCategoryId(categoryId); + } } diff --git a/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java index 2d9cac5..e34a561 100644 --- a/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java +++ b/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java @@ -5,7 +5,6 @@ import com.github.pagehelper.PageHelper; import com.sky.constant.MessageConstant; import com.sky.constant.PasswordConstant; import com.sky.constant.StatusConstant; -import com.sky.context.BaseContext; import com.sky.dto.EmployeeDTO; import com.sky.dto.EmployeeLoginDTO; import com.sky.dto.EmployeePageQueryDTO; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.DigestUtils; -import java.time.LocalDateTime; import java.util.List; @Service diff --git a/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java new file mode 100644 index 0000000..30d7e1f --- /dev/null +++ b/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java @@ -0,0 +1,57 @@ +package com.sky.service.impl; + +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import com.sky.dto.SetmealDTO; +import com.sky.dto.SetmealPageQueryDTO; +import com.sky.entity.Setmeal; +import com.sky.entity.SetmealDish; +import com.sky.mapper.SetmealDishMapper; +import com.sky.mapper.SetmealMapper; +import com.sky.result.PageResult; +import com.sky.service.SetmealService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class SetmealServiceImpl implements SetmealService { + + @Autowired + private SetmealMapper setmealMapper; + @Autowired + private SetmealDishMapper setmealDishMapper; + + /** + * 套餐分页查询 + * @param setmealPageQueryDTO + * @return + */ + @Override + public PageResult pageQuery(SetmealPageQueryDTO setmealPageQueryDTO) { + //设置分页 + PageHelper.startPage(setmealPageQueryDTO.getPage(), setmealPageQueryDTO.getPageSize()); + Page page = setmealMapper.pageQuery(setmealPageQueryDTO); + return new PageResult(page.getTotal(),page.getResult()); + } + + /** + * 新增套餐 + * @param setmealDTO + */ + @Override + @Transactional + public void insert(SetmealDTO setmealDTO) { + //插入套餐信息 + Setmeal setmeal = new Setmeal(); + BeanUtils.copyProperties(setmealDTO,setmeal); + setmealMapper.insert(setmeal); + + //插入套餐包含菜品的信息 + List setmealDishes = setmealDTO.getSetmealDishes(); + setmealDishMapper.insertBatch(setmealDishes); + } +} diff --git a/sky-server/src/main/resources/mapper/SetmealDishMapper.xml b/sky-server/src/main/resources/mapper/SetmealDishMapper.xml index 249df71..5ed50f6 100644 --- a/sky-server/src/main/resources/mapper/SetmealDishMapper.xml +++ b/sky-server/src/main/resources/mapper/SetmealDishMapper.xml @@ -3,6 +3,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + insert into setmeal_dish (setmeal_id, dish_id, name, price, copies) + values + + (#{sd.setmealId},#{sd.dishId},#{sd.name},#{sd.price},#{sd.copies}) + + + select * from setmeal + + and name like concat('%',name,'%') + and category_id = #{categoryId} + and status = #{status} + + + \ No newline at end of file