From 1951e18871eb95ffa9769231037f50e5c3c70fbe Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Thu, 17 Jun 2021 18:42:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E8=B0=B1=E5=88=B6=E4=BD=9C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=BF=AB=E6=8D=B7=E5=88=97=E8=A1=A8=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysDishesController.java | 1 + .../stdiet/custom/mapper/SysDishesMapper.java | 10 ++++ .../custom/service/ISysDishesService.java | 9 +++ .../service/impl/SysDishesServiceImpl.java | 12 ++++ .../mapper/custom/SysDishesMapper.xml | 8 +++ stdiet-ui/src/api/custom/recipes.js | 14 +++++ stdiet-ui/src/store/modules/recipes.js | 1 + stdiet-ui/src/utils/shortCutUtils.js | 28 ++++++++- .../InfoView/ShortCutCom/index.vue | 58 +++++++++++++++++-- .../RecipesView/RecipesCom/index.vue | 3 + 10 files changed, 137 insertions(+), 7 deletions(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysDishesController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysDishesController.java index af5b66e53..74c1a5e42 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysDishesController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysDishesController.java @@ -71,6 +71,7 @@ public class SysDishesController extends BaseController { public AjaxResult getMenuTypes(@PathVariable("id") Long id) { JSONObject object = new JSONObject(); object.put("type", sysDishesService.getDishesMenuTypeById(id)); + object.put("className", sysDishesService.getDishClassNameById(id)); return AjaxResult.success(object); } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysDishesMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysDishesMapper.java index 58cea23e5..6df35fb08 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysDishesMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysDishesMapper.java @@ -3,9 +3,11 @@ package com.stdiet.custom.mapper; import com.stdiet.custom.domain.SysDishes; import com.stdiet.custom.domain.SysDishesIngredient; import com.stdiet.custom.domain.SysPhysicalSignsObj; +import org.apache.ibatis.annotations.Param; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 菜品Mapper接口 @@ -80,4 +82,12 @@ public interface SysDishesMapper { int deleteDishesNotRecByDishesId(Long dishesId); + + /** + * 根据菜品ID查询大类小类名称 + * @param dishId + * @return + */ + String getDishClassNameById(@Param("dishId")Long dishId); + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysDishesService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysDishesService.java index 03f058e11..765823661 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysDishesService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysDishesService.java @@ -1,6 +1,8 @@ package com.stdiet.custom.service; import java.util.List; +import java.util.Map; + import com.stdiet.custom.domain.SysDishes; import com.stdiet.custom.domain.SysDishesIngredient; import com.stdiet.custom.domain.SysIngredient; @@ -66,4 +68,11 @@ public interface ISysDishesService public String getDishesMenuTypeById(Long id); + /** + * 根据菜品ID查询大类小类名称 + * @param dishId + * @return + */ + String getDishClassNameById(Long dishId); + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysDishesServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysDishesServiceImpl.java index 906493262..c3e01cfa5 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysDishesServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysDishesServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 菜品Service业务层处理 @@ -183,4 +184,15 @@ public class SysDishesServiceImpl implements ISysDishesService { return sysDishesMapper.getDishesMenuTypeById(id); } + + /** + * 根据菜品ID查询大类小类名称 + * @param dishId + * @return + */ + @Override + public String getDishClassNameById(Long dishId){ + return sysDishesMapper.getDishClassNameById(dishId); + } + } \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml index 2ef345d3d..da6d88115 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml @@ -207,4 +207,12 @@ delete from sys_dishes_not_rec where dishes_id=#{dishesId} + + + \ No newline at end of file diff --git a/stdiet-ui/src/api/custom/recipes.js b/stdiet-ui/src/api/custom/recipes.js index 3842cc8d1..4fe01a607 100644 --- a/stdiet-ui/src/api/custom/recipes.js +++ b/stdiet-ui/src/api/custom/recipes.js @@ -45,3 +45,17 @@ export function replaceMenuApi(data) { data }); } + +/** + * 根据菜品ID查询大类小类名称 + * @param dishId + */ +export function getDishClassNameById(dishId) { + return request({ + url: "/custom/recipes/getDishClassNameById", + method: "get", + params: {'dishId':dishId} + }); +} + + diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js index 1fbe644f8..23e4e2a08 100644 --- a/stdiet-ui/src/store/modules/recipes.js +++ b/stdiet-ui/src/store/modules/recipes.js @@ -555,6 +555,7 @@ const actions = { id: new Date().getTime(), name: tarDishes.name, type: response.data.type.split(",").sort(), + className: response.data.className, //大类小类名称 data: tarDishes }).then(() => { window.postMessage( diff --git a/stdiet-ui/src/utils/shortCutUtils.js b/stdiet-ui/src/utils/shortCutUtils.js index 53fe07159..df49202b9 100644 --- a/stdiet-ui/src/utils/shortCutUtils.js +++ b/stdiet-ui/src/utils/shortCutUtils.js @@ -1,8 +1,19 @@ -export function getShortCut() { +export function getShortCut(key) { return new Promise((res, rej) => { try { const data = JSON.parse(localStorage.getItem("shortCut") || "[]"); - res(data); + //关键字检索 + if(key != undefined && key != null && key != ""){ + const resultData = []; + data.forEach((item,index) => { + if(item.name.indexOf(key) != -1 || (item.className != undefined && item.className != null && item.className.indexOf(key) != -1)){ + resultData.push(item); + } + }); + res(resultData); + }else{ + res(data); + } } catch (error) { rej(error); } @@ -35,6 +46,19 @@ export async function removeShortCut(id) { }); } +export async function removeMuchShortCut(ids) { + const shortCutList = await getShortCut(); + return new Promise((res, rej) => { + try { + const newShortCutList = shortCutList.filter(obj => ids.indexOf(obj.id) == -1); + localStorage.setItem("shortCut", JSON.stringify(newShortCutList)); + res(); + } catch (error) { + rej(error); + } + }); +} + export async function editShortCut(data) { const shortCutList = await getShortCut(); return new Promise((res, rej) => { diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/ShortCutCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/ShortCutCom/index.vue index 3693aa495..1499eff0b 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/ShortCutCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/ShortCutCom/index.vue @@ -1,14 +1,32 @@