zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

菜品绑定修改

Browse Source
This commit is contained in:
qjq
2024-04-09 16:38:48 +08:00
parent d58a6d0f16
commit 07530d0b55
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/DevuceController.java
View File

@ -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<List<DishesRespVO>> getDishesList(@RequestParam("carteenId") Long carteenId) {
List<DishesDO> dishesList = devuceService.getDishesList(carteenId);
public CommonResult<List<DishesRespVO>> getDishesList(@RequestParam("carteenId") Long carteenId,
@RequestParam("dishecType")Long dishecType) {
List<DishesDO> 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<List<DishesTypeRespVO>> getDishesTypeList(@RequestParam("carteenId") Long carteenId) {
List<DishesTypeDO> dishesTypeList = devuceService.getDishesTypeList(carteenId);
return success(BeanUtils.toBean(dishesTypeList, DishesTypeRespVO.class));
}
// @GetMapping("/page")
// @Operation(summary = "获得设备分页")
// public CommonResult<PageResult<DevuceRespVO>> getDevucePage(@Valid DevucePageReqVO pageReqVO) {

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java
View File

@ -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<DevuceDO> getDevucePage(DevucePageReqVO pageReqVO);
DishesDO getDevuceList(String sn);
List<DishesDO> getDishesList(Long carteenId);
List<DishesDO> getDishesList(Long carteenId,Long dishecType);
/**
* @Description: 获取菜品分类
* @Author: qjq
* @Date: 2024/4/9 上午10:33
* @return
*/
List<DishesTypeDO> getDishesTypeList(Long carteenId);
}

22
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
View File

@ -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<DishesDO> getDishesList(Long carteenId) {
public List<DishesDO> getDishesList(Long carteenId,Long dishecType) {
//获取已绑定的菜品id
List<Long> collect = devuceMapper.selectList(new LambdaQueryWrapperX<DevuceDO>()
.eq(DevuceDO::getBind, DevuceDO.BIND))
@ -110,6 +113,19 @@ public class DevuceServiceImpl implements DevuceService {
return dishesMapper.selectList(new LambdaQueryWrapperX<DishesDO>()
.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<DishesTypeDO> getDishesTypeList(Long carteenId) {
return dishesTypeMapper.selectList(new LambdaQueryWrapperX<DishesTypeDO>().eq(DishesTypeDO::getCarteenId,carteenId));
}
}