From 07530d0b55503cd38c42f278fee79f0993371825 Mon Sep 17 00:00:00 2001 From: qjq <1766193529@qq.com> Date: Tue, 9 Apr 2024 16:38:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E7=BB=91=E5=AE=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/devuce/DevuceController.java | 13 +++++++++-- .../system/service/devuce/DevuceService.java | 10 ++++++++- .../service/devuce/DevuceServiceImpl.java | 22 ++++++++++++++++--- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/DevuceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/DevuceController.java index 892de9ee..fe7865dd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/DevuceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/DevuceController.java @@ -3,8 +3,10 @@ package cn.iocoder.yudao.module.system.controller.app.devuce; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesRespVO; +import cn.iocoder.yudao.module.system.controller.admin.dishestype.vo.DishesTypeRespVO; import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.dishes.DishesDO; +import cn.iocoder.yudao.module.system.dal.dataobject.dishestype.DishesTypeDO; import cn.iocoder.yudao.module.system.service.devuce.DevuceService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -66,8 +68,9 @@ public class DevuceController { // } @GetMapping("/dishes/list") @Operation(summary = "获得菜品列表") - public CommonResult> getDishesList(@RequestParam("carteenId") Long carteenId) { - List dishesList = devuceService.getDishesList(carteenId); + public CommonResult> getDishesList(@RequestParam("carteenId") Long carteenId, + @RequestParam("dishecType")Long dishecType) { + List dishesList = devuceService.getDishesList(carteenId,dishecType); return success(BeanUtils.toBean(dishesList, DishesRespVO.class)); } @GetMapping("/list") @@ -76,6 +79,12 @@ public class DevuceController { DishesDO devuceList = devuceService.getDevuceList(sn); return success(BeanUtils.toBean(devuceList, DishesRespVO.class)); } + @GetMapping("/type") + @Operation(summary = "获取菜品分类") + public CommonResult> getDishesTypeList(@RequestParam("carteenId") Long carteenId) { + List dishesTypeList = devuceService.getDishesTypeList(carteenId); + return success(BeanUtils.toBean(dishesTypeList, DishesTypeRespVO.class)); + } // @GetMapping("/page") // @Operation(summary = "获得设备分页") // public CommonResult> getDevucePage(@Valid DevucePageReqVO pageReqVO) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java index 66ff8747..0a4e6916 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevucePageReqVO; import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.devuce.DevuceDO; import cn.iocoder.yudao.module.system.dal.dataobject.dishes.DishesDO; +import cn.iocoder.yudao.module.system.dal.dataobject.dishestype.DishesTypeDO; import javax.validation.Valid; import java.util.List; @@ -54,5 +55,12 @@ public interface DevuceService { */ PageResult getDevucePage(DevucePageReqVO pageReqVO); DishesDO getDevuceList(String sn); - List getDishesList(Long carteenId); + List getDishesList(Long carteenId,Long dishecType); + /** + * @Description: 获取菜品分类 + * @Author: qjq + * @Date: 2024/4/9 上午10:33 + * @return + */ + List getDishesTypeList(Long carteenId); } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java index 1bd9826d..85057eb1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java @@ -8,8 +8,10 @@ import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevucePageReqVO; import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.devuce.DevuceDO; import cn.iocoder.yudao.module.system.dal.dataobject.dishes.DishesDO; +import cn.iocoder.yudao.module.system.dal.dataobject.dishestype.DishesTypeDO; import cn.iocoder.yudao.module.system.dal.mysql.devuce.DevuceMapper; import cn.iocoder.yudao.module.system.dal.mysql.dishes.DishesMapper; +import cn.iocoder.yudao.module.system.dal.mysql.dishestype.DishesTypeMapper; import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.springframework.stereotype.Service; @@ -34,7 +36,8 @@ public class DevuceServiceImpl implements DevuceService { private DevuceMapper devuceMapper; @Resource private DishesMapper dishesMapper; - + @Resource + private DishesTypeMapper dishesTypeMapper; @Override public Long createDevuce(DevuceSaveReqVO createReqVO) { // 插入 @@ -101,7 +104,7 @@ public class DevuceServiceImpl implements DevuceService { } @Override - public List getDishesList(Long carteenId) { + public List getDishesList(Long carteenId,Long dishecType) { //获取已绑定的菜品id List collect = devuceMapper.selectList(new LambdaQueryWrapperX() .eq(DevuceDO::getBind, DevuceDO.BIND)) @@ -110,6 +113,19 @@ public class DevuceServiceImpl implements DevuceService { return dishesMapper.selectList(new LambdaQueryWrapperX() .notIn(DishesDO::getId, collect) - .eq(DishesDO::getCarteenId,carteenId)); + .eq(DishesDO::getCarteenId,carteenId) + .eq(DishesDO::getDishecType,dishecType)); + } + + /** + * @param carteenId + * @return + * @Description: 获取菜品分类 + * @Author: qjq + * @Date: 2024/4/9 上午10:33 + */ + @Override + public List getDishesTypeList(Long carteenId) { + return dishesTypeMapper.selectList(new LambdaQueryWrapperX().eq(DishesTypeDO::getCarteenId,carteenId)); } } \ No newline at end of file