diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookCollectionDishesController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookCollectionDishesController.java index 6e8a963..0604289 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookCollectionDishesController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookCollectionDishesController.java @@ -9,14 +9,11 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.common.log.annotation.SysLog; -import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.canteen.core.cook.domain.CookCollectionDishes; import com.bonus.canteen.core.cook.service.ICookCollectionDishesService; import com.bonus.common.core.web.controller.BaseController; @@ -112,8 +109,8 @@ public class CookCollectionDishesController extends BaseController { //@PreventRepeatSubmit //@RequiresPermissions("cook:dishes:remove") @SysLog(title = "菜品收藏", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除菜品收藏") - @PostMapping("/del/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(cookCollectionDishesService.deleteCookCollectionDishesByIds(ids)); + @PostMapping("/del/{dishesIds}") + public AjaxResult remove(@PathVariable Long[] dishesIds) { + return toAjax(cookCollectionDishesService.deleteCookCollectionDishesByDishesIds(dishesIds)); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookCollectionDishesMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookCollectionDishesMapper.java index 9f2086f..ece5e07 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookCollectionDishesMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookCollectionDishesMapper.java @@ -61,5 +61,5 @@ public interface CookCollectionDishesMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteCookCollectionDishesByIds(Long[] ids); + public int deleteCookCollectionDishesByDishesIds(Long[] ids); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/ICookCollectionDishesService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/ICookCollectionDishesService.java index 746aa1b..599824f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/ICookCollectionDishesService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/ICookCollectionDishesService.java @@ -47,10 +47,10 @@ public interface ICookCollectionDishesService { /** * 批量删除菜品收藏 * - * @param ids 需要删除的菜品收藏主键集合 + * @param dishesIds 需要删除的菜品收藏主键集合 * @return 结果 */ - public int deleteCookCollectionDishesByIds(Long[] ids); + public int deleteCookCollectionDishesByDishesIds(Long[] dishesIds); /** * 删除菜品收藏信息 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookCollectionDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookCollectionDishesServiceImpl.java index e103805..b6b8857 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookCollectionDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookCollectionDishesServiceImpl.java @@ -94,12 +94,12 @@ public class CookCollectionDishesServiceImpl implements ICookCollectionDishesSer /** * 批量删除菜品收藏 * - * @param ids 需要删除的菜品收藏主键 + * @param dishesIds 需要删除的菜品收藏主键 * @return 结果 */ @Override - public int deleteCookCollectionDishesByIds(Long[] ids) { - return cookCollectionDishesMapper.deleteCookCollectionDishesByIds(ids); + public int deleteCookCollectionDishesByDishesIds(Long[] dishesIds) { + return cookCollectionDishesMapper.deleteCookCollectionDishesByDishesIds(dishesIds); } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookCollectionDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookCollectionDishesMapper.xml index 5188bcf..9651af5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookCollectionDishesMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookCollectionDishesMapper.xml @@ -91,10 +91,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from cook_collection_dishes where id = #{id} - - delete from cook_collection_dishes where id in - - #{id} + + delete from cook_collection_dishes where dishes_id in + + #{dishesId} \ No newline at end of file