From 89d5369c4feefd8065822d1f2e67c54da39387d8 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Fri, 14 Mar 2025 11:13:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=A0=82=EF=BC=9A=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E6=9C=BA=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceMenuController.java | 109 ++++++++++++++++++ .../common/service/DeviceMenuService.java | 48 ++++---- .../canteen/core/menu/api/MenuDishesApi.java | 18 ++- .../canteen/core/menu/api/MenuRecipeApi.java | 9 +- .../service/impl/MenuRecipeServiceImpl.java | 1 + .../core/menu/vo/IssueRecipeCompressVO.java | 1 + 6 files changed, 151 insertions(+), 35 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/android/common/controller/DeviceMenuController.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/android/common/controller/DeviceMenuController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/android/common/controller/DeviceMenuController.java new file mode 100644 index 00000000..20d986ca --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/android/common/controller/DeviceMenuController.java @@ -0,0 +1,109 @@ +package com.bonus.canteen.core.device.android.common.controller; + +import com.bonus.canteen.core.device.android.common.service.DeviceMenuService; +import com.bonus.canteen.core.menu.vo.AndroidRecipeTypeDetailVO; +import com.bonus.canteen.core.menu.vo.IssueRecipeCompressVO; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.houqin.utils.HeaderFetchUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@RestController +@Api( + tags = {"设备基础接口（菜品）"} +) +@RequestMapping({"/api/v4/device/common/menu/"}) +public class DeviceMenuController { + private static final Logger log = LoggerFactory.getLogger(DeviceMenuController.class); + @Autowired + private DeviceMenuService deviceMenuService; + + @PostMapping({"/bind-info-config"}) + @ApiOperation("获取菜谱菜品信息（根据sn）") + public IssueRecipeCompressVO queryBySn(@RequestHeader Map headers) { + String machineSn = HeaderFetchUtil.getMachineSn(headers); + return this.deviceMenuService.queryBySn(machineSn); + } + +// @PostMapping({"/bind-recipeid-info-config"}) +// @ApiOperation("获取菜谱菜品信息（根据菜谱Id）") +// public IssueRecipeCompressVO queryByRecipeId(@RequestHeader Map headers, @RequestBody Long content) { +// return this.deviceMenuService.queryByRecipeId(content); +// } + + @PostMapping({"/all/menu-type-list"}) + @ApiOperation("获取所有菜品类别") + public AjaxResult getAllMenuDishesTypeList() { + return AjaxResult.success(this.deviceMenuService.getAllMenuDishesTypeList()); + } + +// @PostMapping({"/order-evaluate-add"}) +// @ApiOperation("新增订单菜品评价") +// public AjaxResult addAndroidOrderEvaluateSelfTerminal(@RequestBody MenuEvaluateSelfAddDTO content) { +// this.deviceMenuService.addAndroidOrderEvaluateSelfTerminal(content); +// return AjaxResult.success(); +// } +// +// @PostMapping({"/dishes-evaluate-page"}) +// @ApiOperation("获取指定菜品评价信息") +// public Page getAndroidDishesEvaluatePage(@RequestBody AndroidDishesEvaluateDTO content) { +// return this.deviceMenuService.getAndroidDishesEvaluatePage(content); +// } + + @PostMapping({"/all/dishes-list"}) + @ApiOperation("获取全部菜品") + public AjaxResult getProductionMachineRecipe() { + List androidRecipeTypeDetailVOList = this.deviceMenuService.getProductionMachineRecipe(); + return AjaxResult.success(androidRecipeTypeDetailVOList); + } +// +// @PostMapping({"/all/dishes-list/page"}) +// @ApiOperation("分页获取全部菜品") +// public AjaxResult getAllDishesByPage(@RequestBody PageDTO content) { +// PageVO androidRecipeTypeDetailVOList = this.deviceMenuService.getAllDishesByPage(content); +// return AjaxResult.success(androidRecipeTypeDetailVOList); +// } + +// @PostMapping({"/recipe-detail"}) +// @ApiOperation("获取菜谱详情") +// public List getAndroidRecipeDetail(@RequestHeader Map headers, @RequestBody @Valid AndroidRecipeDetailV2DTO content) { +// return this.deviceMenuService.getAndroidRecipeDetail(headers, content); +// } +// +// @PostMapping({"/get/recipe/detail/by/id"}) +// @ApiOperation("设备获取指定菜谱的详情(手持机)") +// public AjaxResult androidGetRecipeDishes(@RequestHeader Map headers, @RequestBody @Valid AndroidGetRecipeDishesDTO content) { +// List resultList = this.deviceMenuService.androidGetRecipeDishes(headers, content); +// return AjaxResult.success(resultList); +// } +// +// @PostMapping({"/dishes/add"}) +// @ApiOperation("设备添加菜品") +// public AjaxResult deviceAddDishes(@RequestHeader Map headers, @RequestBody @Valid DeviceAddDishesDto content) { +// return AjaxResult.success(this.deviceMenuService.deviceAddDishes(content)); +// } +// +// @PostMapping({"/dishes/add/to-recipe"}) +// @ApiOperation("设备添加菜品到菜谱") +// public LeResponse deviceAddDishesToRecipe(@RequestHeader Map headers, @RequestBody @Valid LeRequest request) { +// String machineSn = HeaderFetchUtil.getMachineSn(headers); +// this.deviceMenuService.deviceAddDishesToRecipe(machineSn, (AndroidAddRecipeDishesDTO)request.getContent()); +// return LeResponse.succ(); +// } +// +// @PostMapping({"/recipe/get"}) +// @ApiOperation("设备查询所有菜谱") +// public LeResponse> deviceSearchRecipe(@RequestHeader Map headers, @RequestBody @Valid LeRequest request) { +// return LeResponse.succ(this.deviceMenuService.deviceSearchRecipe((DeviceSearchRecipeDto)request.getContent())); +// } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/android/common/service/DeviceMenuService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/android/common/service/DeviceMenuService.java index de3fd5b2..c3c1411b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/android/common/service/DeviceMenuService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/android/common/service/DeviceMenuService.java @@ -1,18 +1,24 @@ package com.bonus.canteen.core.device.android.common.service; +import cn.hutool.core.bean.BeanUtil; import com.bonus.canteen.core.common.redis.RedisUtil; import com.bonus.canteen.core.common.utils.JavaxValidateUtils; import com.bonus.canteen.core.common.utils.TenantContextHolder; import com.bonus.canteen.core.device.android.common.dto.MenuSendByDTO; import com.bonus.canteen.core.device.android.common.dto.MenuSendDTO; import com.bonus.canteen.core.device.android.constant.DeviceMqMessage; +import com.bonus.canteen.core.device.api.DeviceApi; import com.bonus.canteen.core.device.manage.dto.DeviceSearchDTO; import com.bonus.canteen.core.device.manage.model.DeviceInfo; import com.bonus.canteen.core.device.manage.service.DeviceInfoService; import com.bonus.canteen.core.device.mq.MacMessage; +import com.bonus.canteen.core.menu.api.MenuDishesApi; import com.bonus.canteen.core.menu.api.MenuRecipeApi; import com.bonus.canteen.core.menu.dto.IssueRecipeV2DTO; +import com.bonus.canteen.core.menu.entity.MenuDishesType; +import com.bonus.canteen.core.menu.vo.AndroidRecipeTypeDetailVO; import com.bonus.canteen.core.menu.vo.IssueRecipeCompressVO; +import com.bonus.canteen.core.menu.vo.MenuDishesTypeAllVO; import com.bonus.common.houqin.constant.LeConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,12 +39,12 @@ public class DeviceMenuService { @Autowired @Lazy private DeviceInfoService deviceInfoService; -// @Autowired -// @Lazy -// private DeviceApi deviceApi; -// @Autowired -// @Lazy -// private MenuDishesApi menuDishesApi; + @Autowired + @Lazy + private DeviceApi deviceApi; + @Autowired + @Lazy + private MenuDishesApi menuDishesApi; // @Autowired // @Lazy // private AndroidMenuService androidMenuService; @@ -71,20 +77,20 @@ public class DeviceMenuService { }); } // -// public IssueRecipeCompressVO queryBySn(String machineSn) { -// Long recipeId = this.deviceApi.getFirstRecipeIdBySn(machineSn); -// return recipeId == null ? new IssueRecipeCompressVO() : this.queryByRecipeId(recipeId); -// } + public IssueRecipeCompressVO queryBySn(String machineSn) { + Long recipeId = this.deviceApi.getFirstRecipeIdBySn(machineSn); + return recipeId == null ? new IssueRecipeCompressVO() : this.queryByRecipeId(recipeId); + } // -// public IssueRecipeCompressVO queryByRecipeId(Long recipeId) { -// IssueRecipeV2DTO issueRecipeV2DTO = new IssueRecipeV2DTO(recipeId, LocalDate.now(), LocalDate.now().plusDays(6L)); -// return this.menuRecipeApi.issueRecipeV2Compress(issueRecipeV2DTO); -// } + public IssueRecipeCompressVO queryByRecipeId(Long recipeId) { + IssueRecipeV2DTO issueRecipeV2DTO = new IssueRecipeV2DTO(recipeId, LocalDate.now(), LocalDate.now().plusDays(6L)); + return this.menuRecipeApi.issueRecipeV2Compress(issueRecipeV2DTO); + } // -// public List getAllMenuDishesTypeList() { -// List allMenuDishesType = this.menuDishesApi.getAllMenuDishesType(); -// return BeanUtil.copyToList(allMenuDishesType, MenuDishesTypeAllVO.class); -// } + public List getAllMenuDishesTypeList() { + List allMenuDishesType = this.menuDishesApi.getAllMenuDishesType(); + return BeanUtil.copyToList(allMenuDishesType, MenuDishesTypeAllVO.class); + } // // public void addAndroidOrderEvaluateSelfTerminal(MenuEvaluateSelfAddDTO menuEvaluateSelfAddDTO) { // this.androidMenuService.addAndroidOrderEvaluateSelfTerminal(menuEvaluateSelfAddDTO); @@ -94,9 +100,9 @@ public class DeviceMenuService { // return this.androidMenuService.getAndroidDishesEvaluatePage(content); // } // -// public List getProductionMachineRecipe() { -// return this.menuRecipeApi.getProductionMachineRecipe(); -// } + public List getProductionMachineRecipe() { + return this.menuRecipeApi.getProductionMachineRecipe(); + } // // public List getAndroidRecipeDetail(Map headers, AndroidRecipeDetailV2DTO content) { // return this.androidMenuService.getAndroidRecipeDetail(headers, content); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/api/MenuDishesApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/api/MenuDishesApi.java index 048818c6..65cae935 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/api/MenuDishesApi.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/api/MenuDishesApi.java @@ -9,11 +9,9 @@ import com.bonus.canteen.core.common.utils.TreeNodeUtil; import com.bonus.canteen.core.customer.utils.DelFlagEnum; import com.bonus.canteen.core.menu.dto.IssueRecipeV2DTO; import com.bonus.canteen.core.menu.dto.MenuRecipeChangeSurplusNum; -import com.bonus.canteen.core.menu.entity.MenuDishes; -import com.bonus.canteen.core.menu.entity.MenuDishesStepDetail; -import com.bonus.canteen.core.menu.entity.MenuMaterialCategory; -import com.bonus.canteen.core.menu.entity.MenuRecipe; +import com.bonus.canteen.core.menu.entity.*; import com.bonus.canteen.core.menu.mapper.MenuDishesMapper; +import com.bonus.canteen.core.menu.mapper.MenuDishesTypeMapper; import com.bonus.canteen.core.menu.mapper.MenuMaterialCategoryMapper; import com.bonus.canteen.core.menu.mapper.MenuRecipeMapper; import com.bonus.canteen.core.menu.model.MenuDishesTypeModel; @@ -54,9 +52,9 @@ public class MenuDishesApi { // @Autowired // @Lazy // private MenuCustomDictMapper menuCustomDictMapper; -// @Autowired -// @Lazy -// private MenuDishesTypeMapper menuDishesTypeMapper; + @Autowired + @Lazy + private MenuDishesTypeMapper menuDishesTypeMapper; // @Autowired // @Lazy // private MenuMaterialMapper menuMaterialMapper; @@ -119,9 +117,9 @@ public class MenuDishesApi { // return (MenuDishesType)this.menuDishesTypeMapper.selectOne((Wrapper)Wrappers.lambdaQuery(MenuDishesType.class).eq(MenuDishesType::getTypeId, typeId)); // } // -// public List getAllMenuDishesType() { -// return this.menuDishesTypeMapper.selectList((Wrapper)Wrappers.lambdaQuery(MenuDishesType.class).eq(MenuDishesType::getDelFlag, LeConstants.COMMON_NO)); -// } + public List getAllMenuDishesType() { + return this.menuDishesTypeMapper.selectList(Wrappers.lambdaQuery(MenuDishesType.class).eq(MenuDishesType::getDelFlag, LeConstants.COMMON_NO)); + } // // public void updateCustLimitIdUse(Integer customId, Integer ifCustLimitIdUse) { // } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/api/MenuRecipeApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/api/MenuRecipeApi.java index 8cbfbae4..fda54b13 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/api/MenuRecipeApi.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/api/MenuRecipeApi.java @@ -14,6 +14,7 @@ import com.bonus.canteen.core.menu.mapper.MenuRecipeMapper; import com.bonus.canteen.core.menu.service.MenuRecipeBindSortService; import com.bonus.canteen.core.menu.service.MenuRecipeDishesService; import com.bonus.canteen.core.menu.service.MenuRecipeService; +import com.bonus.canteen.core.menu.vo.AndroidRecipeTypeDetailVO; import com.bonus.canteen.core.menu.vo.CheckDishesVo; import com.bonus.canteen.core.menu.vo.IssueRecipeCompressVO; import com.bonus.common.houqin.constant.DelFlagEnum; @@ -153,10 +154,10 @@ public class MenuRecipeApi { MenuRecipeSortEnum sortEnum = this.getMenuRecipeSortEnum(deviceType); return (List)(sortEnum != null && !ObjectUtil.isEmpty(deviceBindDTOS) ? this.menuAppRecipeMapper.getBindByTypeAndStalls(deviceBindDTOS, sortEnum.getBindType()) : new ArrayList()); } -// -// public List getProductionMachineRecipe() { -// return this.menuRecipeService.getProductionMachineRecipe(); -// } + + public List getProductionMachineRecipe() { + return this.menuRecipeService.getProductionMachineRecipe(); + } // // public List getAndroidRecipeListSelfTerminal(MenuSelfRecipeListDTO content) { // return this.androidMenuService.getAndroidRecipeListSelfTerminal(content); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java index b8bc38e8..4280ca34 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java @@ -2293,6 +2293,7 @@ public class MenuRecipeServiceImpl extends ServiceImpl getProductionMachineRecipe() { return this.menuDishesMapper.selectAllDishesByType(); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/IssueRecipeCompressVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/IssueRecipeCompressVO.java index 9aa89964..57e62a51 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/IssueRecipeCompressVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/IssueRecipeCompressVO.java @@ -81,4 +81,5 @@ public class IssueRecipeCompressVO implements Serializable { public void setMealList(final List mealList) { this.mealList = mealList; } + }