From 2ea049b31e6991616dab386eb63993ce4d58cc7b Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 18 Apr 2025 13:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8F=9C=E5=93=81relation?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/menu/mapper/MenuDishesMapper.java    |  6 --
 .../service/impl/MenuDishesServiceImpl.java   | 47 ------------
 .../mapper/menu/MenuDishesMapper.xml          | 72 -------------------
 3 files changed, 125 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesMapper.java
index 366562d..4269f69 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesMapper.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesMapper.java
@@ -72,12 +72,6 @@ public interface MenuDishesMapper {
 
     int addMenuDishes(MenuDishesDTO menuDishesDTO);
 
-    int adddishesLabel(MenuDishesRelation menuDishesRelation);
-    int adddishesTaste(MenuDishesRelation menuDishesRelation);
-    int adddishesSeason(MenuDishesRelation menuDishesRelation);
-    int adddishesSuit(MenuDishesRelation menuDishesRelation);
-    int adddishesMeal(MenuDishesRelation menuDishesRelation);
-
     NutritionEntity getNutritionEntity(MenuDishesAddMaterialDTO dto);
 
     int addFinalNutrition(NutritionEntity nutritionEntity);
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
index a994837..d45322a 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
@@ -144,53 +144,6 @@ public class MenuDishesServiceImpl implements IMenuDishesService {
        //添加主要信息
         int dishesNum =  menuDishesMapper.addMenuDishes(menuDishesDTO);
 
-        //添加菜品关联信息
-        //标签
-        List<Integer> labelIdList = menuDishesDTO.getLabelIdList();
-        for (Integer i: labelIdList) {
-            MenuDishesRelation menuDishesRelation = new MenuDishesRelation();
-            menuDishesRelation.setKeyWordId(i);
-            menuDishesRelation.setCrby(SecurityUtils.getUserId());
-            menuDishesRelation.setDishesId(dishesId);
-            menuDishesMapper.adddishesLabel(menuDishesRelation);
-        }
-        //口味
-        List<Integer> tasteIdList = menuDishesDTO.getTasteIdList();
-        for (Integer i: tasteIdList) {
-            MenuDishesRelation menuDishesRelation = new MenuDishesRelation();
-            menuDishesRelation.setKeyWordId(i);
-            menuDishesRelation.setCrby(SecurityUtils.getUserId());
-            menuDishesRelation.setDishesId(dishesId);
-            menuDishesMapper.adddishesTaste(menuDishesRelation);
-        }
-        //季节分类
-        List<Integer> seasonList = menuDishesDTO.getSeason();
-        for (Integer i: tasteIdList) {
-            MenuDishesRelation menuDishesRelation = new MenuDishesRelation();
-            menuDishesRelation.setKeyWordId(i);
-            menuDishesRelation.setCrby(SecurityUtils.getUserId());
-            menuDishesRelation.setDishesId(dishesId);
-            menuDishesMapper.adddishesSeason(menuDishesRelation);
-        }
-        //适宜人群
-        List<Integer> suitIdList = menuDishesDTO.getSuitIdList();
-        for (Integer i: suitIdList) {
-            MenuDishesRelation menuDishesRelation = new MenuDishesRelation();
-            menuDishesRelation.setKeyWordId(i);
-            menuDishesRelation.setCrby(SecurityUtils.getUserId());
-            menuDishesRelation.setDishesId(dishesId);
-            menuDishesMapper.adddishesSuit(menuDishesRelation);
-        }
-        //餐次
-        List<Integer> mealList= menuDishesDTO.getMealList();
-        for (Integer i: mealList) {
-            MenuDishesRelation menuDishesRelation = new MenuDishesRelation();
-            menuDishesRelation.setKeyWordId(i);
-            menuDishesRelation.setCrby(SecurityUtils.getUserId());
-            menuDishesRelation.setDishesId(dishesId);
-            menuDishesMapper.adddishesMeal(menuDishesRelation);
-        }
-
         List<MenuDishesAddMaterialDTO> materialList= menuDishesDTO.getMaterialList();
         List<NutritionEntity> nutritionEntityList = new ArrayList<>();
         System.err.println("长度："+materialList.size());
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
index 3fb78fc..7cc7794 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
@@ -429,78 +429,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
-
-    <insert id="adddishesLabel" parameterType="com.bonus.canteen.core.menu.domain.MenuDishesRelation">
-        insert into menu_dishes_label_relation
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="keyWordId != null">label_id,</if>
-            <if test="dishesId != null">dishes_id,</if>
-            <if test="crby != null">crby,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="keyWordId != null">#{keyWordId},</if>
-            <if test="dishesId != null">#{dishesId},</if>
-            <if test="crby != null">#{crby},</if>
-        </trim>
-    </insert>
-
-
-    <insert id="adddishesTaste"  parameterType="com.bonus.canteen.core.menu.domain.MenuDishesRelation">
-        insert into menu_dishes_taste_relation
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="keyWordId != null">taste_id,</if>
-            <if test="dishesId != null">dishes_id,</if>
-            <if test="crby != null">crby,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="keyWordId != null">#{keyWordId},</if>
-            <if test="dishesId != null">#{dishesId},</if>
-            <if test="crby != null">#{crby},</if>
-        </trim>
-    </insert>
-
-    <insert id="adddishesSeason"  parameterType="com.bonus.canteen.core.menu.domain.MenuDishesRelation">
-        insert into menu_dishes_season_relation
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="keyWordId != null">season_id,</if>
-            <if test="dishesId != null">dishes_id,</if>
-            <if test="crby != null">crby,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="keyWordId != null">#{keyWordId},</if>
-            <if test="dishesId != null">#{dishesId},</if>
-            <if test="crby != null">#{crby},</if>
-        </trim>
-    </insert>
-
-    <insert id="adddishesSuit" parameterType="com.bonus.canteen.core.menu.domain.MenuDishesRelation">
-        insert into menu_dishes_suit_relation
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="keyWordId != null">suit_id,</if>
-            <if test="dishesId != null">dishes_id,</if>
-            <if test="crby != null">crby,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="keyWordId != null">#{keyWordId},</if>
-            <if test="dishesId != null">#{dishesId},</if>
-            <if test="crby != null">#{crby},</if>
-        </trim>
-    </insert>
-
-    <insert id="adddishesMeal" parameterType="com.bonus.canteen.core.menu.domain.MenuDishesRelation">
-        insert into menu_dishes_meal_relation
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="keyWordId != null">meal_id,</if>
-            <if test="dishesId != null">dishes_id,</if>
-            <if test="crby != null">crby,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="keyWordId != null">#{keyWordId},</if>
-            <if test="dishesId != null">#{dishesId},</if>
-            <if test="crby != null">#{crby},</if>
-        </trim>
-    </insert>
-
     <select id="getNutritionEntity" resultType="com.bonus.canteen.core.utils.NutritionEntity" parameterType="com.bonus.canteen.core.menu.dto.MenuDishesAddMaterialDTO">
         select calories,fat,protein,carbohydrate,dietary_fiber as dietaryFiber,
         cholesterol,calcium,sodium,purine,iron,