From 8e34480b8ffe202547358e71fd292cc0987ddc00 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 10 Feb 2025 09:11:14 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"jsk=20=20=E9=A2=84=E5=AE=9A=E9=A4=90"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 908dbaaef0f01db0f633f1ca6e7c32a202f356af. --- .../core/menu/service/MenuDishesService.java | 2 +- .../service/impl/MenuDishesServiceImpl.java | 62 +++++++++---------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuDishesService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuDishesService.java index d689b9b5..d2beec13 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuDishesService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuDishesService.java @@ -6,7 +6,7 @@ import com.bonus.core.menu.utils.NutritionEntity; import java.util.Map; -public interface MenuDishesService { +public interface MenuDishesService extends IService { // Long addMenuDishes(MenuDishesAddDTO dishesAddDTO, Integer customId); // // Page getMenuDishesPage(String content); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java index 2cfc122e..82060c24 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java @@ -16,8 +16,6 @@ import com.bonus.core.menu.utils.NutritionEntity; import com.bonus.core.menu.utils.NutritionEntityUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.List; @@ -25,7 +23,7 @@ import java.util.Map; import java.util.stream.Collectors; @Service -public class MenuDishesServiceImpl implements MenuDishesService { +public class MenuDishesServiceImpl extends ServiceImpl implements MenuDishesService { private static final Logger log = LoggerFactory.getLogger(MenuDishesServiceImpl.class); // @Lazy @@ -117,9 +115,9 @@ public class MenuDishesServiceImpl implements MenuDishesService { // name = "yunshitangTaskExecutor" // ) // private AsyncTaskExecutor asyncTaskExecutor; - @Autowired - @Lazy - private MenuDishesMapper menuDishesMapper; +// @Autowired +// @Lazy +// private MenuDishesMapper menuDishesMapper; // @Autowired // @Lazy // private MenuaiServiceApi menuaiServiceApi; @@ -184,33 +182,6 @@ public class MenuDishesServiceImpl implements MenuDishesService { // @Transactional( // rollbackFor = {Exception.class} // ) - - @Override - public NutritionEntity getNutrientInfo(Map dishesQuantityMap) { - LogUtil.info("查询营养信息", dishesQuantityMap); - if (CollUtil.isNotEmpty(dishesQuantityMap)) { - List dishesIdList = ListUtil.toList(dishesQuantityMap.keySet()); - List menuDishesList = this.getMenuDishesList(dishesIdList); - if (CollUtil.isNotEmpty(menuDishesList)) { - List nutritionEntityList = (List)menuDishesList.stream().map((item) -> { - Double weight = (Double)dishesQuantityMap.get(item.getDishesId()); - NutritionEntity nutritionEntity = (NutritionEntity) BeanUtil.copyProperties(item, NutritionEntity.class, new String[0]); - nutritionEntity.setWeight(weight); - nutritionEntity.setBaseWeight(item.getWeight()); - return nutritionEntity; - }).collect(Collectors.toList()); - return NutritionEntityUtil.countNutrition(nutritionEntityList); - } - } - - return new NutritionEntity(); - } - - public List getMenuDishesList(List dishesIdList) { - return null; -// menuDishesMapper.list((Wrapper)((LambdaQueryWrapper) Wrappers.lambdaQuery(MenuDishes.class) -// .in(MenuDishes::getDishesId, dishesIdList)).eq(MenuDishes::getDelFlag, LeConstants.COMMON_NO)); - } // public Long addMenuDishes(MenuDishesAddDTO dishesAddDTO, Integer customId) { // Long count = ((MenuDishesMapper)this.baseMapper).selectCount((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(MenuDishes.class).eq(MenuDishes::getDishesName, dishesAddDTO.getDishesName())).eq(MenuDishes::getDelFlag, DelFlagEnum.DEL_FALSE.key())); // if (count != null && count > 0L) { @@ -2580,6 +2551,31 @@ public class MenuDishesServiceImpl implements MenuDishesService { // }, Collectors.mapping(DishesLabelDto::getName, Collectors.toList()))); // } + @Override + public NutritionEntity getNutrientInfo(Map dishesQuantityMap) { + LogUtil.info("查询营养信息", dishesQuantityMap); + if (CollUtil.isNotEmpty(dishesQuantityMap)) { + List dishesIdList = ListUtil.toList(dishesQuantityMap.keySet()); + List menuDishesList = this.getMenuDishesList(dishesIdList); + if (CollUtil.isNotEmpty(menuDishesList)) { + List nutritionEntityList = (List)menuDishesList.stream().map((item) -> { + Double weight = (Double)dishesQuantityMap.get(item.getDishesId()); + NutritionEntity nutritionEntity = (NutritionEntity) BeanUtil.copyProperties(item, NutritionEntity.class, new String[0]); + nutritionEntity.setWeight(weight); + nutritionEntity.setBaseWeight(item.getWeight()); + return nutritionEntity; + }).collect(Collectors.toList()); + return NutritionEntityUtil.countNutrition(nutritionEntityList); + } + } + + return new NutritionEntity(); + } + + public List getMenuDishesList(List dishesIdList) { + return this.list((Wrapper)((LambdaQueryWrapper) Wrappers.lambdaQuery(MenuDishes.class) + .in(MenuDishes::getDishesId, dishesIdList)).eq(MenuDishes::getDelFlag, LeConstants.COMMON_NO)); + } // // public void updateDishesNutrition(List materialIds) { // List menuUpdateDishesModels = this.menuMaterialDishesService.selectDishesList(materialIds);