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 0b802ef..a06c188 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 @@ -113,7 +113,7 @@ public class MenuCollectionDishesController extends BaseController { //@RequiresPermissions("menu:dishes:remove") @SysLog(title = "菜品收藏", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除菜品收藏") @PostMapping("/del/{dishesIds}") - public AjaxResult remove(@PathVariable Long[] dishesIds) { + public AjaxResult remove(@PathVariable String[] dishesIds) { return toAjax(menuCollectionDishesService.deleteMenuCollectionDishesByIds(dishesIds)); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuCollectionDishes.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuCollectionDishes.java index bcd6e28..44f0f32 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuCollectionDishes.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuCollectionDishes.java @@ -2,6 +2,8 @@ package com.bonus.canteen.core.menu.domain; import com.bonus.canteen.core.common.utils.FileUrlUtil; import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -38,6 +40,7 @@ public class MenuCollectionDishes extends BaseEntity { /** 菜品id */ @Excel(name = "菜品id") @ApiModelProperty(value = "菜品id") + @JsonSerialize(using = ToStringSerializer.class) private Long dishesId; @ApiModelProperty(value = "菜品名称") 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 d39fde6..25da778 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 @@ -48,7 +48,7 @@ public interface MenuCollectionDishesMapper { * @param dishesId 菜品收藏主键 * @return 结果 */ - public int deleteMenuCollectionDishesById(Long dishesId); + public int deleteMenuCollectionDishesById(String dishesId); /** * 批量删除菜品收藏 @@ -56,5 +56,5 @@ public interface MenuCollectionDishesMapper { * @param dishesIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteMenuCollectionDishesByIds(Long[] dishesIds); + public int deleteMenuCollectionDishesByIds(String[] 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 3a58e7f..e2429f4 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 @@ -48,7 +48,7 @@ public interface IMenuCollectionDishesService { * @param dishesIds 需要删除的菜品收藏主键集合 * @return 结果 */ - public int deleteMenuCollectionDishesByIds(Long[] dishesIds); + public int deleteMenuCollectionDishesByIds(String[] dishesIds); /** * 删除菜品收藏信息 @@ -56,5 +56,5 @@ public interface IMenuCollectionDishesService { * @param dishesId 菜品收藏主键 * @return 结果 */ - public int deleteMenuCollectionDishesById(Long dishesId); + public int deleteMenuCollectionDishesById(String 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 e8d3d54..e305dd2 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 @@ -81,7 +81,7 @@ public class MenuCollectionDishesServiceImpl implements IMenuCollectionDishesSer * @return 结果 */ @Override - public int deleteMenuCollectionDishesByIds(Long[] ids) { + public int deleteMenuCollectionDishesByIds(String[] ids) { return menuCollectionDishesMapper.deleteMenuCollectionDishesByIds(ids); } @@ -92,7 +92,7 @@ public class MenuCollectionDishesServiceImpl implements IMenuCollectionDishesSer * @return 结果 */ @Override - public int deleteMenuCollectionDishesById(Long id) { + public int deleteMenuCollectionDishesById(String id) { return menuCollectionDishesMapper.deleteMenuCollectionDishesById(id); } } 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 4935a57..41ae3d4 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 @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dishes_id = #{dishesId} - + delete from menu_collection_dishes where dishes_id = #{dishesId}