diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuCollectionDishesController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuCollectionDishesController.java index 81e9cd5..0b802ef 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuCollectionDishesController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuCollectionDishesController.java @@ -68,9 +68,9 @@ public class MenuCollectionDishesController extends BaseController { */ @ApiOperation(value = "获取菜品收藏详细信息") //@RequiresPermissions("menu:dishes:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(menuCollectionDishesService.selectMenuCollectionDishesById(id)); + @GetMapping(value = "/{dishesId}") + public AjaxResult getInfo(@PathVariable("dishesId") Long dishesId) { + return success(menuCollectionDishesService.selectMenuCollectionDishesById(dishesId)); } /** @@ -112,8 +112,8 @@ public class MenuCollectionDishesController extends BaseController { //@PreventRepeatSubmit //@RequiresPermissions("menu:dishes:remove") @SysLog(title = "菜品收藏", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除菜品收藏") - @PostMapping("/del/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(menuCollectionDishesService.deleteMenuCollectionDishesByIds(ids)); + @PostMapping("/del/{dishesIds}") + public AjaxResult remove(@PathVariable Long[] dishesIds) { + return toAjax(menuCollectionDishesService.deleteMenuCollectionDishesByIds(dishesIds)); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuCollectionDishesMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuCollectionDishesMapper.java index a8079a5..d39fde6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuCollectionDishesMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuCollectionDishesMapper.java @@ -13,10 +13,10 @@ public interface MenuCollectionDishesMapper { /** * 查询菜品收藏 * - * @param id 菜品收藏主键 + * @param dishesId 菜品收藏主键 * @return 菜品收藏 */ - public MenuCollectionDishes selectMenuCollectionDishesById(Long id); + public MenuCollectionDishes selectMenuCollectionDishesById(Long dishesId); /** * 查询菜品收藏列表 @@ -45,16 +45,16 @@ public interface MenuCollectionDishesMapper { /** * 删除菜品收藏 * - * @param id 菜品收藏主键 + * @param dishesId 菜品收藏主键 * @return 结果 */ - public int deleteMenuCollectionDishesById(Long id); + public int deleteMenuCollectionDishesById(Long dishesId); /** * 批量删除菜品收藏 * - * @param ids 需要删除的数据主键集合 + * @param dishesIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteMenuCollectionDishesByIds(Long[] ids); + public int deleteMenuCollectionDishesByIds(Long[] dishesIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuCollectionDishesService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuCollectionDishesService.java index 633c5e3..3a58e7f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuCollectionDishesService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuCollectionDishesService.java @@ -13,10 +13,10 @@ public interface IMenuCollectionDishesService { /** * 查询菜品收藏 * - * @param id 菜品收藏主键 + * @param dishesId 菜品收藏主键 * @return 菜品收藏 */ - public MenuCollectionDishes selectMenuCollectionDishesById(Long id); + public MenuCollectionDishes selectMenuCollectionDishesById(Long dishesId); /** * 查询菜品收藏列表 @@ -45,16 +45,16 @@ public interface IMenuCollectionDishesService { /** * 批量删除菜品收藏 * - * @param ids 需要删除的菜品收藏主键集合 + * @param dishesIds 需要删除的菜品收藏主键集合 * @return 结果 */ - public int deleteMenuCollectionDishesByIds(Long[] ids); + public int deleteMenuCollectionDishesByIds(Long[] dishesIds); /** * 删除菜品收藏信息 * - * @param id 菜品收藏主键 + * @param dishesId 菜品收藏主键 * @return 结果 */ - public int deleteMenuCollectionDishesById(Long id); + public int deleteMenuCollectionDishesById(Long dishesId); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuCollectionDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuCollectionDishesServiceImpl.java index 0545ab0..e8d3d54 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuCollectionDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuCollectionDishesServiceImpl.java @@ -23,12 +23,12 @@ public class MenuCollectionDishesServiceImpl implements IMenuCollectionDishesSer /** * 查询菜品收藏 * - * @param id 菜品收藏主键 + * @param dishesId 菜品收藏主键 * @return 菜品收藏 */ @Override - public MenuCollectionDishes selectMenuCollectionDishesById(Long id) { - return menuCollectionDishesMapper.selectMenuCollectionDishesById(id); + public MenuCollectionDishes selectMenuCollectionDishesById(Long dishesId) { + return menuCollectionDishesMapper.selectMenuCollectionDishesById(dishesId); } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuCollectionDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuCollectionDishesMapper.xml index 0f83bb8..4935a57 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuCollectionDishesMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuCollectionDishesMapper.xml @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -82,17 +82,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where id = #{id} + where dishes_id = #{dishesId} - delete from menu_collection_dishes where id = #{id} + delete from menu_collection_dishes where dishes_id = #{dishesId} - delete from menu_collection_dishes where id in + delete from menu_collection_dishes where dishes_id in - #{id} + #{dishesId} \ No newline at end of file