From 15dffba36bb27ca3a338ab036c4d547c3726570b Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sat, 26 Apr 2025 15:36:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MenuEvaluaDetailController.java | 12 +++++------ .../controller/MenuEvaluaOrderController.java | 6 +++--- .../core/menu/domain/MenuEvaluaDetail.java | 3 --- .../core/menu/domain/MenuEvaluaOrder.java | 3 --- .../menu/mapper/MenuEvaluaDetailMapper.java | 12 +++++------ .../menu/mapper/MenuEvaluaOrderMapper.java | 12 +++++------ .../impl/MenuEvaluaDetailServiceImpl.java | 20 +++++++++--------- .../impl/MenuEvaluaOrderServiceImpl.java | 12 +++++------ .../mapper/menu/MenuEvaluaDetailMapper.xml | 20 ++++++++---------- .../mapper/menu/MenuEvaluaOrderMapper.xml | 21 +++++++++---------- 10 files changed, 56 insertions(+), 65 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaDetailController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaDetailController.java index 29e7f13..ed9fea6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaDetailController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaDetailController.java @@ -68,9 +68,9 @@ public class MenuEvaluaDetailController extends BaseController { */ @ApiOperation(value = "获取订单评价菜品详细信息") //@RequiresPermissions("menu:detail:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(menuEvaluaDetailService.selectMenuEvaluaDetailById(id)); + @GetMapping(value = "/{detailId}") + public AjaxResult getInfo(@PathVariable("detailId") Long detailId) { + return success(menuEvaluaDetailService.selectMenuEvaluaDetailById(detailId)); } /** @@ -112,8 +112,8 @@ public class MenuEvaluaDetailController extends BaseController { //@PreventRepeatSubmit //@RequiresPermissions("menu:detail:remove") @SysLog(title = "订单评价菜品", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除订单评价菜品") - @PostMapping("/del/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(menuEvaluaDetailService.deleteMenuEvaluaDetailByIds(ids)); + @PostMapping("/del/{detailIds}") + public AjaxResult remove(@PathVariable Long[] detailIds) { + return toAjax(menuEvaluaDetailService.deleteMenuEvaluaDetailByIds(detailIds)); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaOrderController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaOrderController.java index f9f41bc..4600f58 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaOrderController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaOrderController.java @@ -70,9 +70,9 @@ public class MenuEvaluaOrderController extends BaseController { */ @ApiOperation(value = "获取订单评价详细信息") //@RequiresPermissions("menu:order:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(menuEvaluaOrderService.selectMenuEvaluaOrderById(id)); + @GetMapping(value = "/{evaluaId}") + public AjaxResult getInfo(@PathVariable("evaluaId") Long evaluaId) { + return success(menuEvaluaOrderService.selectMenuEvaluaOrderById(evaluaId)); } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaDetail.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaDetail.java index c4a1506..7c6a19a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaDetail.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaDetail.java @@ -19,9 +19,6 @@ import com.bonus.common.core.web.domain.BaseEntity; public class MenuEvaluaDetail extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键id */ - private Long id; - /** 详情id */ @Excel(name = "详情id") @ApiModelProperty(value = "详情id") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaOrder.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaOrder.java index bd692bc..fe966f7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaOrder.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaOrder.java @@ -21,9 +21,6 @@ import com.bonus.common.core.web.domain.BaseEntity; public class MenuEvaluaOrder extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键id */ - private Long id; - /** 评价id */ @Excel(name = "评价id") @ApiModelProperty(value = "评价id") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaDetailMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaDetailMapper.java index 95bc06b..4c75d19 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaDetailMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaDetailMapper.java @@ -13,10 +13,10 @@ public interface MenuEvaluaDetailMapper { /** * 查询订单评价菜品 * - * @param id 订单评价菜品主键 + * @param detailId 订单评价菜品主键 * @return 订单评价菜品 */ - public MenuEvaluaDetail selectMenuEvaluaDetailById(Long id); + public MenuEvaluaDetail selectMenuEvaluaDetailById(Long detailId); /** * 查询订单评价菜品列表 @@ -45,16 +45,16 @@ public interface MenuEvaluaDetailMapper { /** * 删除订单评价菜品 * - * @param id 订单评价菜品主键 + * @param detailId 订单评价菜品主键 * @return 结果 */ - public int deleteMenuEvaluaDetailById(Long id); + public int deleteMenuEvaluaDetailById(Long detailId); /** * 批量删除订单评价菜品 * - * @param ids 需要删除的数据主键集合 + * @param detailIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteMenuEvaluaDetailByIds(Long[] ids); + public int deleteMenuEvaluaDetailByIds(Long[] detailIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaOrderMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaOrderMapper.java index 861bb3f..f2ab224 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaOrderMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaOrderMapper.java @@ -14,10 +14,10 @@ public interface MenuEvaluaOrderMapper { /** * 查询订单评价 * - * @param id 订单评价主键 + * @param evaluaId 订单评价主键 * @return 订单评价 */ - public MenuEvaluaOrder selectMenuEvaluaOrderById(Long id); + public MenuEvaluaOrder selectMenuEvaluaOrderById(Long evaluaId); /** * 查询订单评价列表 @@ -46,16 +46,16 @@ public interface MenuEvaluaOrderMapper { /** * 删除订单评价 * - * @param id 订单评价主键 + * @param evaluaId 订单评价主键 * @return 结果 */ - public int deleteMenuEvaluaOrderById(Long id); + public int deleteMenuEvaluaOrderById(Long evaluaId); /** * 批量删除订单评价 * - * @param ids 需要删除的数据主键集合 + * @param evaluaIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteMenuEvaluaOrderByIds(Long[] ids); + public int deleteMenuEvaluaOrderByIds(Long[] evaluaIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaDetailServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaDetailServiceImpl.java index 76c2d43..63b4a04 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaDetailServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaDetailServiceImpl.java @@ -23,12 +23,12 @@ public class MenuEvaluaDetailServiceImpl implements IMenuEvaluaDetailService { /** * 查询订单评价菜品 * - * @param id 订单评价菜品主键 + * @param detailId 订单评价菜品主键 * @return 订单评价菜品 */ @Override - public MenuEvaluaDetail selectMenuEvaluaDetailById(Long id) { - return menuEvaluaDetailMapper.selectMenuEvaluaDetailById(id); + public MenuEvaluaDetail selectMenuEvaluaDetailById(Long detailId) { + return menuEvaluaDetailMapper.selectMenuEvaluaDetailById(detailId); } /** @@ -76,23 +76,23 @@ public class MenuEvaluaDetailServiceImpl implements IMenuEvaluaDetailService { /** * 批量删除订单评价菜品 - * - * @param ids 需要删除的订单评价菜品主键 + * + * @param detailIds 需要删除的订单评价菜品主键 * @return 结果 */ @Override - public int deleteMenuEvaluaDetailByIds(Long[] ids) { - return menuEvaluaDetailMapper.deleteMenuEvaluaDetailByIds(ids); + public int deleteMenuEvaluaDetailByIds(Long[] detailIds) { + return menuEvaluaDetailMapper.deleteMenuEvaluaDetailByIds(detailIds); } /** * 删除订单评价菜品信息 * - * @param id 订单评价菜品主键 + * @param detailId 订单评价菜品主键 * @return 结果 */ @Override - public int deleteMenuEvaluaDetailById(Long id) { - return menuEvaluaDetailMapper.deleteMenuEvaluaDetailById(id); + public int deleteMenuEvaluaDetailById(Long detailId) { + return menuEvaluaDetailMapper.deleteMenuEvaluaDetailById(detailId); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaOrderServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaOrderServiceImpl.java index 0ba297b..3a93aad 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaOrderServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaOrderServiceImpl.java @@ -79,22 +79,22 @@ public class MenuEvaluaOrderServiceImpl implements IMenuEvaluaOrderService { /** * 批量删除订单评价 * - * @param ids 需要删除的订单评价主键 + * @param evaluaIds 需要删除的订单评价主键 * @return 结果 */ @Override - public int deleteMenuEvaluaOrderByIds(Long[] ids) { - return menuEvaluaOrderMapper.deleteMenuEvaluaOrderByIds(ids); + public int deleteMenuEvaluaOrderByIds(Long[] evaluaIds) { + return menuEvaluaOrderMapper.deleteMenuEvaluaOrderByIds(evaluaIds); } /** * 删除订单评价信息 * - * @param id 订单评价主键 + * @param evaluaId 订单评价主键 * @return 结果 */ @Override - public int deleteMenuEvaluaOrderById(Long id) { - return menuEvaluaOrderMapper.deleteMenuEvaluaOrderById(id); + public int deleteMenuEvaluaOrderById(Long evaluaId) { + return menuEvaluaOrderMapper.deleteMenuEvaluaOrderById(evaluaId); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaDetailMapper.xml index 638f35c..485778e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaDetailMapper.xml @@ -4,7 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - @@ -19,7 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, detail_id, evalua_id, meal_type, meal_id, star_level, description, revision, create_by, create_time, update_by, update_time from menu_evalua_detail + select detail_id, evalua_id, meal_type, meal_id, star_level, description, + revision, create_by, create_time, update_by, update_time + from menu_evalua_detail - where id = #{id} + where detail_id = #{detailId} - + insert into menu_evalua_detail - detail_id, evalua_id, meal_type, meal_id, @@ -56,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, - #{detailId}, #{evaluaId}, #{mealType}, #{mealId}, @@ -73,7 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update menu_evalua_detail - detail_id = #{detailId}, evalua_id = #{evaluaId}, meal_type = #{mealType}, meal_id = #{mealId}, @@ -85,17 +83,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where id = #{id} + where detail_id = #{detailId} - delete from menu_evalua_detail where id = #{id} + delete from menu_evalua_detail where detail_id = #{detailId} - delete from menu_evalua_detail where id in + delete from menu_evalua_detail where detail_id in - #{id} + #{detailId} \ No newline at end of file diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaOrderMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaOrderMapper.xml index 1664abf..6a1c6dd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaOrderMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaOrderMapper.xml @@ -4,7 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - @@ -23,7 +22,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, evalua_id, ord_id, star_level, description, reply, reply_time, shopstall_id, show_flag, del_flag, revision, order_evalua_type, create_by, create_time, update_by, update_time from menu_evalua_order + select evalua_id, ord_id, star_level, description, reply, reply_time, + shopstall_id, show_flag, del_flag, revision, order_evalua_type, + create_by, create_time, update_by, update_time + from menu_evalua_order - where id = #{id} + where evalua_id = #{evaluaId} - + insert into menu_evalua_order - evalua_id, ord_id, star_level, description, @@ -67,7 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, - #{evaluaId}, #{ordId}, #{starLevel}, #{description}, @@ -88,7 +88,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update menu_evalua_order - evalua_id = #{evaluaId}, ord_id = #{ordId}, star_level = #{starLevel}, description = #{description}, @@ -104,17 +103,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, - where id = #{id} + where evalua_id = #{evaluaId} - delete from menu_evalua_order where id = #{id} + delete from menu_evalua_order where evalua_id = #{evaluaId} - delete from menu_evalua_order where id in + delete from menu_evalua_order where evalua_id in - #{id} + #{evaluaId} \ No newline at end of file