diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuNutritionController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuNutritionController.java index 3ad6619..da9b07e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuNutritionController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuNutritionController.java @@ -88,7 +88,7 @@ public class MenuNutritionController extends BaseController { //@RequiresPermissions("menu:nutrition:add") @SysLog(title = "食材营养基础信息", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增食材营养基础信息") @PostMapping("/add") - public AjaxResult add(@RequestBody MenuNutritionDTO menuNutrition) { + public AjaxResult add(@RequestBody MenuNutrition menuNutrition) { try { return toAjax(menuNutritionService.insertMenuNutrition(menuNutrition)); } catch (Exception e) { @@ -104,7 +104,7 @@ public class MenuNutritionController extends BaseController { //@RequiresPermissions("menu:nutrition:edit") @SysLog(title = "食材营养基础信息", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改食材营养基础信息") @PostMapping("/edit") - public AjaxResult edit(@RequestBody MenuNutritionDTO menuNutrition) { + public AjaxResult edit(@RequestBody MenuNutrition menuNutrition) { try { return toAjax(menuNutritionService.updateMenuNutrition(menuNutrition)); } catch (Exception e) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java index c449be1..531dbec 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java @@ -512,10 +512,4 @@ public class MenuNutrition extends BaseEntity { @ApiModelProperty(value = "乐观锁") private Long revision; - @ApiModelProperty("更新时间") - private LocalDateTime uptime; - - @ApiModelProperty("创建人") - private String crby; - } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuNutritionDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuNutritionDTO.java index 1ed1f2b..61f99ca 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuNutritionDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuNutritionDTO.java @@ -215,8 +215,6 @@ public class MenuNutritionDTO { private Double polydatin; @ApiModelProperty("备注/原产地") private String originPlace; - @ApiModelProperty("删除标识(1删除,2正常)") - private Integer delFlag; private Integer current; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuNutritionMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuNutritionMapper.java index 59d9eed..7ec2767 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuNutritionMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuNutritionMapper.java @@ -44,7 +44,7 @@ public interface MenuNutritionMapper { * @param menuNutrition 食材营养基础信息 * @return 结果 */ - public int updateMenuNutrition(MenuNutritionDTO menuNutrition); + public int updateMenuNutrition(MenuNutrition menuNutrition); /** * 删除食材营养基础信息 @@ -67,14 +67,5 @@ public interface MenuNutritionMapper { * @param menuNutrition 实体 * @return 食材营养基础信息 */ - MenuNutrition getOne(MenuNutritionDTO menuNutrition); - - - int delSuitDishesBatch(MenuNutritionDTO menuNutritionDTO); - - int insertMenuSuitDishes(List suitDishesList); - - int delDishesEffect(MenuNutritionDTO menuNutritionDTO); - - int insertMenuDishesEffect(List effectIdsList); + MenuNutrition queryIfExistMenuNutrition(MenuNutrition menuNutrition); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuNutritionService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuNutritionService.java index 20d6360..209c610 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuNutritionService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuNutritionService.java @@ -33,7 +33,7 @@ public interface IMenuNutritionService { * @param menuNutrition 食材营养基础信息 * @return 结果 */ - public int insertMenuNutrition(MenuNutritionDTO menuNutrition); + public int insertMenuNutrition(MenuNutrition menuNutrition); /** * 修改食材营养基础信息 @@ -41,7 +41,7 @@ public interface IMenuNutritionService { * @param menuNutrition 食材营养基础信息 * @return 结果 */ - public int updateMenuNutrition(MenuNutritionDTO menuNutrition); + public int updateMenuNutrition(MenuNutrition menuNutrition); /** * 批量删除食材营养基础信息 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionServiceImpl.java index a959831..c6091a3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionServiceImpl.java @@ -4,6 +4,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Objects; import cn.hutool.core.collection.CollUtil; import com.bonus.canteen.core.menu.domain.MenuDishesEffectRelation; @@ -18,6 +19,7 @@ import com.bonus.common.houqin.i18n.I18n; import com.bonus.common.houqin.utils.LeBeanUtil; import com.bonus.common.houqin.utils.id.Id; import com.bonus.common.security.utils.SecurityUtils; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,6 +33,7 @@ import com.bonus.canteen.core.menu.domain.MenuNutrition; * @date 2025-04-03 */ @Service +@Slf4j public class MenuNutritionServiceImpl implements IMenuNutritionService { @Autowired private MenuNutritionMapper menuNutritionMapper; @@ -61,102 +64,37 @@ public class MenuNutritionServiceImpl implements IMenuNutritionService { /** * 新增食材营养基础信息 * - * @param menuNutritionDTO 食材营 + * @param menuNutrition 食材营 * 养基础信息 * @return 结果 */ @Override - public int insertMenuNutrition(MenuNutritionDTO menuNutritionDTO) { - try { - MenuNutrition menuNutrition = this.menuNutritionMapper.getOne(menuNutritionDTO); - String username = SecurityUtils.getUsername(); - List effectIdList; - if (ObjectUtils.isNotEmpty(menuNutrition)) { - if (!DelFlagEnum.DEL_TRUE.key().equals(menuNutrition.getDelFlag())) { - throw new ServiceException(I18n.getMessage("营养信息已存在", new Object[0])); - } - //菜品功效关联 - BnsUtils.copyProperties(menuNutritionDTO, menuNutrition); - List suitIdList = menuNutritionDTO.getSuitablePopulationList(); - - menuNutritionMapper.delSuitDishesBatch(menuNutritionDTO); - if (CollUtil.isNotEmpty(suitIdList)) { - this.insertSuitDishesBatch(suitIdList, menuNutritionDTO.getNutritionId(), username); - } - //事宜人群 - effectIdList = menuNutritionDTO.getEffectList(); - menuNutritionMapper.delDishesEffect(menuNutritionDTO); - if (CollUtil.isNotEmpty(effectIdList)) { - this.insertEffectBatch(effectIdList, menuNutritionDTO.getNutritionId(), username); - } - menuNutrition.setUptime(LocalDateTime.now()); - menuNutrition.setDelFlag(DelFlagEnum.DEL_FALSE.key()); - return menuNutritionMapper.updateMenuNutrition(menuNutritionDTO); - - }else{ - if(menuNutrition == null){ - menuNutrition = new MenuNutrition(); - } - Long nutritionId = Id.next(); - menuNutrition.setNutritionId(Id.next()); - menuNutrition.setCrby(username); - menuNutrition.setId(nutritionId); - BnsUtils.copyProperties(menuNutritionDTO, menuNutrition); - return menuNutritionMapper.insertMenuNutrition(menuNutrition); - } - } catch (Exception e) { - throw new ServiceException(e.toString()); + public int insertMenuNutrition(MenuNutrition menuNutrition) { + MenuNutrition existMenuNutrition = menuNutritionMapper.queryIfExistMenuNutrition(menuNutrition); + if (Objects.nonNull(existMenuNutrition)) { + throw new ServiceException("应用编码或名称重复"); } - } - - - private void insertEffectBatch(List effectIdList, Long nutritionId, String username) { - List effectIdsList = new ArrayList<>(); - Iterator var5 = effectIdList.iterator(); - - while(var5.hasNext()) { - Long effectId = (Long)var5.next(); - MenuDishesEffectRelation menuDishesEffectRelation = new MenuDishesEffectRelation(); - menuDishesEffectRelation.setDishesId(nutritionId); - menuDishesEffectRelation.setEffectId(effectId); - menuDishesEffectRelation.setCrby(username); - effectIdsList.add(menuDishesEffectRelation); - } - this.menuNutritionMapper.insertMenuDishesEffect(effectIdsList); - - } - private void insertSuitDishesBatch(List suitIdList, Long nutritionId, String username) { - List suitDishesList = new ArrayList<>(); - Iterator var5 = suitIdList.iterator(); - - while(var5.hasNext()) { - Long suitId = (Long)var5.next(); - MenuSuitDishes suitDishes = new MenuSuitDishes(); - suitDishes.setDishesId(nutritionId); - suitDishes.setSuitId(suitId); - suitDishes.setCrby(username); - suitDishesList.add(suitDishes); - } - - this.menuNutritionMapper.insertMenuSuitDishes(suitDishesList); + menuNutrition.setNutritionId(Id.next()); + menuNutrition.setCreateBy(SecurityUtils.getUsername()); + menuNutrition.setCreateTime(DateUtils.getNowDate()); + return menuNutritionMapper.insertMenuNutrition(menuNutrition); } /** * 修改食材营养基础信息 * - * @param menuNutritionDTO 食材营养基础信息 + * @param menuNutrition 食材营养基础信息 * @return 结果 */ @Override - public int updateMenuNutrition(MenuNutritionDTO menuNutritionDTO) { + public int updateMenuNutrition(MenuNutrition menuNutrition) { try { - MenuNutrition menuNutrition = this.menuNutritionMapper.getOne(menuNutritionDTO); - if(menuNutrition == null){ - throw new ServiceException(I18n.getMessage("营养信息不存在", new Object[0])); - } - return menuNutritionMapper.updateMenuNutrition(menuNutritionDTO); + menuNutrition.setUpdateBy(SecurityUtils.getUsername()); + menuNutrition.setUpdateTime(DateUtils.getNowDate()); + return menuNutritionMapper.updateMenuNutrition(menuNutrition); } catch (Exception e) { - throw new ServiceException(e.toString()); + log.error("更新营养数据出错, ", e.getMessage()); + throw new ServiceException("更新营养数据出错"); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuNutritionMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuNutritionMapper.xml index da184a9..41a28c3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuNutritionMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuNutritionMapper.xml @@ -37,7 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -115,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" weight, price, color, category_id, big_type, little_type, label, processing_method, processing_time, recommended_combination, combination_not_recommended, edible, water, calories, protein, fat, carbohydrate, dietary_fiber, cholesterol, ash, vitamin_a, carotene, - thiamine, riboflavin, niacin, vitamin_c, vitamin_d, vitamin_e, del_flag, choline, biotin, + thiamine, riboflavin, niacin, vitamin_c, vitamin_d, vitamin_e, choline, biotin, pantothenic_acid, guanine, adenine, hypoxanthine, xanthine, purine, glycemic_index, total_phytosterol_content, cereal_sterol, camelia_sterol, sterol, cereal_steranol, rapesanol, rapeseed_steranol, lutein_zeaxanthin, quercetin, myricetin, luteolin, kaem_pferol, apigenin, isoflavone, daidzein, genistein, glycitein, @@ -178,7 +177,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" vitamin_c, vitamin_d, vitamin_e, - del_flag, choline, biotin, pantothenic_acid, @@ -283,7 +281,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{vitaminC}, #{vitaminD}, #{vitaminE}, - #{delFlag}, #{choline}, #{biotin}, #{pantothenicAcid}, @@ -365,7 +362,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" big_type = #{bigType}, little_type = #{littleType}, processing_time = #{processingTime}, - edible = #{edible}, water = #{water}, calories = #{calories}, @@ -384,7 +380,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" vitamin_c = #{vitaminC}, vitamin_d = #{vitaminD}, vitamin_e = #{vitaminE}, - del_flag = #{delFlag}, choline = #{choline}, biotin = #{biotin}, pantothenic_acid = #{pantothenicAcid}, @@ -459,57 +454,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update menu_nutrition set del_flag = '1' where id in + delete from menu_nutrition where id in #{id} - select * from menu_nutrition where nutrition_code = #{nutritionCode} or nutrition_name = #{nutritionName} - limit 1 - - delete from menu_suit_dishes where dishesId = #{nutritionId} - - - - insert into menu_suit_dishes - - id, - dishes_id, - suit_id, - crby, - - - #{id}, - #{dishesId}, - #{suitId}, - #{crby}, - - - - - - delete from menu_dishes_effect_relation where dishesId = #{nutritionId} - - - - insert into menu_dishes_effect - - id, - dishes_id, - effect_id, - crby, - - - #{id}, - #{dishesId}, - #{effectId}, - #{crby}, - -