Compare commits
2 Commits
master
...
menutype04
| Author | SHA1 | Date |
|---|---|---|
|
|
1965f38505 | |
|
|
31c5d72426 |
|
|
@ -1,6 +1,8 @@
|
|||
package com.bonus.canteen.core.common.domain;
|
||||
|
||||
import com.bonus.canteen.core.alloc.domain.AllocArea;
|
||||
import com.bonus.canteen.core.menu.domain.MenuMaterialCategory;
|
||||
import com.bonus.canteen.core.menu.domain.MenuNutritionType;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
|
@ -50,6 +52,20 @@ public class TreeSelect implements Serializable {
|
|||
this.children = area.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public TreeSelect(MenuNutritionType menuNutritionType) {
|
||||
this.id = menuNutritionType.getId();
|
||||
this.label = menuNutritionType.getName();
|
||||
this.status = menuNutritionType.getDelFlag();
|
||||
this.children = menuNutritionType.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public TreeSelect(MenuMaterialCategory menuMaterialCategory) {
|
||||
this.id = menuMaterialCategory.getId();
|
||||
this.label = menuMaterialCategory.getCategoryName();
|
||||
this.status = String.valueOf(menuMaterialCategory.getDelFlag());
|
||||
this.children = menuMaterialCategory.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public Integer getLevel() {
|
||||
return level;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||
import javax.validation.Valid;
|
||||
|
||||
import com.bonus.canteen.core.menu.domain.MenuMaterialCategory;
|
||||
import com.bonus.canteen.core.menu.domain.MenuNutritionType;
|
||||
import com.bonus.canteen.core.menu.dto.CategoryTreeListDTO;
|
||||
import com.bonus.canteen.core.menu.dto.LongIds;
|
||||
import com.bonus.canteen.core.menu.dto.MenuMaterialCategoryAddDTO;
|
||||
|
|
@ -39,6 +40,16 @@ public class MenuMaterialCategoryController extends BaseController {
|
|||
@Autowired
|
||||
private IMenuMaterialCategoryService menuMaterialCategoryService;
|
||||
|
||||
@GetMapping("/menuMaterialCategoryTree")
|
||||
public AjaxResult deptTree(MenuMaterialCategory menuMaterialCategory) {
|
||||
try {
|
||||
return success(menuMaterialCategoryService.selectMenuMaterialCategoryTreeList(menuMaterialCategory));
|
||||
} catch (Exception e) {
|
||||
logger.error(e.toString(), e);
|
||||
}
|
||||
return error("系统异常,请联系管理员");
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询原料类别列表
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -36,6 +36,16 @@ public class MenuNutritionTypeController extends BaseController {
|
|||
@Autowired
|
||||
private IMenuNutritionTypeService menuNutritionTypeService;
|
||||
|
||||
@GetMapping("/menuNutritionTypeTree")
|
||||
public AjaxResult deptTree(MenuNutritionType menuNutritionType) {
|
||||
try {
|
||||
return success(menuNutritionTypeService.selectMenuNutritionTypeTreeList(menuNutritionType));
|
||||
} catch (Exception e) {
|
||||
logger.error(e.toString(), e);
|
||||
}
|
||||
return error("系统异常,请联系管理员");
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询营养基础类型列表
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ import lombok.ToString;
|
|||
import com.bonus.common.core.web.domain.BaseEntity;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 原料类别对象 menu_material_category
|
||||
|
|
@ -62,5 +64,5 @@ public class MenuMaterialCategory extends Model<MenuMaterialCategory> {
|
|||
private Long bigCategoryId;
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
private List<MenuMaterialCategory> children = new ArrayList();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@ import lombok.Data;
|
|||
import lombok.ToString;
|
||||
import com.bonus.common.core.web.domain.BaseEntity;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 营养基础类型对象 menu_nutrition_type
|
||||
*
|
||||
|
|
@ -45,5 +48,5 @@ public class MenuNutritionType extends BaseEntity {
|
|||
@ApiModelProperty(value = "层级")
|
||||
private String level;
|
||||
|
||||
|
||||
private List<MenuNutritionType> children = new ArrayList();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.bonus.canteen.core.menu.service;
|
|||
import java.util.List;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.bonus.canteen.core.common.domain.TreeSelect;
|
||||
import com.bonus.canteen.core.menu.domain.MenuMaterialCategory;
|
||||
import com.bonus.canteen.core.menu.dto.CategoryTreeListDTO;
|
||||
import com.bonus.canteen.core.menu.dto.MenuMaterialCategoryAddDTO;
|
||||
|
|
@ -68,4 +69,6 @@ public interface IMenuMaterialCategoryService extends IService<MenuMaterialCateg
|
|||
void syncAllCategoryBigCategoryAndLevel();
|
||||
|
||||
void generateCategoryNum(Long categoryId, Long parentId, Integer categoryType);
|
||||
|
||||
public List<TreeSelect> selectMenuMaterialCategoryTreeList(MenuMaterialCategory menuMaterialCategory);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.bonus.canteen.core.menu.service;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import com.bonus.canteen.core.common.domain.TreeSelect;
|
||||
import com.bonus.canteen.core.menu.domain.MenuNutritionType;
|
||||
import com.bonus.canteen.core.menu.vo.NutritionTypeV2VO;
|
||||
import com.bonus.canteen.core.menu.vo.NutritionTypeVo;
|
||||
|
|
@ -62,4 +63,6 @@ public interface IMenuNutritionTypeService {
|
|||
public int deleteMenuNutritionTypeById(Long id);
|
||||
|
||||
List<NutritionTypeV2VO> getNutritionTypeList();
|
||||
|
||||
public List<TreeSelect> selectMenuNutritionTypeTreeList(MenuNutritionType menuNutritionType);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ import cn.hutool.core.util.ObjectUtil;
|
|||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bonus.canteen.core.common.domain.TreeSelect;
|
||||
import com.bonus.canteen.core.menu.domain.MenuNutritionType;
|
||||
import com.bonus.canteen.core.menu.dto.CategoryTreeListDTO;
|
||||
import com.bonus.canteen.core.menu.dto.MenuMaterialCategoryAddDTO;
|
||||
import com.bonus.canteen.core.menu.enums.MgrRoleTypeEnum;
|
||||
|
|
@ -21,6 +23,7 @@ import com.bonus.canteen.core.utils.BnsConstants;
|
|||
import com.bonus.canteen.core.utils.GlobalConstants;
|
||||
import com.bonus.canteen.core.utils.TreeNodeUtil;
|
||||
import com.bonus.common.core.exception.ServiceException;
|
||||
import com.bonus.common.core.utils.StringUtils;
|
||||
import com.bonus.common.houqin.constant.DelFlagEnum;
|
||||
import com.bonus.common.houqin.constant.LeConstants;
|
||||
import com.bonus.common.houqin.i18n.I18n;
|
||||
|
|
@ -364,4 +367,71 @@ public class MenuMaterialCategoryServiceImpl extends ServiceImpl<MenuMaterialCat
|
|||
return userAuthPO;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TreeSelect> selectMenuMaterialCategoryTreeList(MenuMaterialCategory menuMaterialCategory) {
|
||||
List<MenuMaterialCategory> menuMaterialCategories = menuMaterialCategoryMapper.selectMenuMaterialCategoryList(menuMaterialCategory);
|
||||
return buildMenuMaterialCategoryTreeSelect(menuMaterialCategories);
|
||||
}
|
||||
|
||||
public List<TreeSelect> buildMenuMaterialCategoryTreeSelect(List<MenuMaterialCategory> menuMaterialCategories)
|
||||
{
|
||||
List<MenuMaterialCategory> menuMaterialCategoryTrees = buildMenuNutritionTypeTree(menuMaterialCategories);
|
||||
return menuMaterialCategoryTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public List<MenuMaterialCategory> buildMenuNutritionTypeTree(List<MenuMaterialCategory> list) {
|
||||
List<MenuMaterialCategory> returnList = new ArrayList<MenuMaterialCategory>();
|
||||
List<Long> tempList = list.stream().map(MenuMaterialCategory::getId).collect(Collectors.toList());
|
||||
for (MenuMaterialCategory category : list)
|
||||
{
|
||||
// 如果是顶级节点, 遍历该父节点的所有子节点
|
||||
if (!tempList.contains(category.getParentId()))
|
||||
{
|
||||
recursionFn(list, category);
|
||||
returnList.add(category);
|
||||
}
|
||||
}
|
||||
if (returnList.isEmpty())
|
||||
{
|
||||
returnList = list;
|
||||
}
|
||||
return returnList;
|
||||
}
|
||||
|
||||
private void recursionFn(List<MenuMaterialCategory> list, MenuMaterialCategory t)
|
||||
{
|
||||
// 得到子节点列表
|
||||
List<MenuMaterialCategory> childList = getChildList(list, t);
|
||||
t.setChildren(childList);
|
||||
for (MenuMaterialCategory tChild : childList)
|
||||
{
|
||||
if (hasChild(list, tChild))
|
||||
{
|
||||
recursionFn(list, tChild);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private List<MenuMaterialCategory> getChildList(List<MenuMaterialCategory> list, MenuMaterialCategory t)
|
||||
{
|
||||
List<MenuMaterialCategory> tlist = new ArrayList<MenuMaterialCategory>();
|
||||
Iterator<MenuMaterialCategory> it = list.iterator();
|
||||
while (it.hasNext())
|
||||
{
|
||||
MenuMaterialCategory n = (MenuMaterialCategory) it.next();
|
||||
if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getId().longValue())
|
||||
{
|
||||
tlist.add(n);
|
||||
}
|
||||
}
|
||||
return tlist;
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否有子节点
|
||||
*/
|
||||
private boolean hasChild(List<MenuMaterialCategory> list, MenuMaterialCategory t)
|
||||
{
|
||||
return getChildList(list, t).size() > 0 ? true : false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,16 @@ package com.bonus.canteen.core.menu.service.impl;
|
|||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import cn.hutool.system.UserInfo;
|
||||
import com.bonus.canteen.core.common.domain.TreeSelect;
|
||||
import com.bonus.canteen.core.menu.mapper.MenuNutritionMapper;
|
||||
import com.bonus.canteen.core.menu.vo.NutritionTypeV2VO;
|
||||
import com.bonus.canteen.core.menu.vo.NutritionTypeVo;
|
||||
import com.bonus.common.core.exception.ServiceException;
|
||||
import com.bonus.common.core.utils.DateUtils;
|
||||
import com.bonus.common.core.utils.StringUtils;
|
||||
import com.bonus.common.security.utils.SecurityUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
@ -152,4 +155,72 @@ public class MenuNutritionTypeServiceImpl implements IMenuNutritionTypeService {
|
|||
// TreeNodeUtil.assembleTree(list);
|
||||
return nutritionTypeVOList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TreeSelect> selectMenuNutritionTypeTreeList(MenuNutritionType menuNutritionType) {
|
||||
List<MenuNutritionType> menuNutritionTypes = selectMenuNutritionTypeList(menuNutritionType);
|
||||
return buildMenuNutritionTypeTreeSelect(menuNutritionTypes);
|
||||
}
|
||||
|
||||
public List<TreeSelect> buildMenuNutritionTypeTreeSelect(List<MenuNutritionType> menuNutritionTypes)
|
||||
{
|
||||
List<MenuNutritionType> menuNutritionTypeTrees = buildMenuNutritionTypeTree(menuNutritionTypes);
|
||||
return menuNutritionTypeTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public List<MenuNutritionType> buildMenuNutritionTypeTree(List<MenuNutritionType> list) {
|
||||
List<MenuNutritionType> returnList = new ArrayList<MenuNutritionType>();
|
||||
List<Long> tempList = list.stream().map(MenuNutritionType::getId).collect(Collectors.toList());
|
||||
for (MenuNutritionType type : list)
|
||||
{
|
||||
// 如果是顶级节点, 遍历该父节点的所有子节点
|
||||
if (!tempList.contains(type.getParentId()))
|
||||
{
|
||||
recursionFn(list, type);
|
||||
returnList.add(type);
|
||||
}
|
||||
}
|
||||
if (returnList.isEmpty())
|
||||
{
|
||||
returnList = list;
|
||||
}
|
||||
return returnList;
|
||||
}
|
||||
|
||||
private void recursionFn(List<MenuNutritionType> list, MenuNutritionType t)
|
||||
{
|
||||
// 得到子节点列表
|
||||
List<MenuNutritionType> childList = getChildList(list, t);
|
||||
t.setChildren(childList);
|
||||
for (MenuNutritionType tChild : childList)
|
||||
{
|
||||
if (hasChild(list, tChild))
|
||||
{
|
||||
recursionFn(list, tChild);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private List<MenuNutritionType> getChildList(List<MenuNutritionType> list, MenuNutritionType t)
|
||||
{
|
||||
List<MenuNutritionType> tlist = new ArrayList<MenuNutritionType>();
|
||||
Iterator<MenuNutritionType> it = list.iterator();
|
||||
while (it.hasNext())
|
||||
{
|
||||
MenuNutritionType n = (MenuNutritionType) it.next();
|
||||
if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getId().longValue())
|
||||
{
|
||||
tlist.add(n);
|
||||
}
|
||||
}
|
||||
return tlist;
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否有子节点
|
||||
*/
|
||||
private boolean hasChild(List<MenuNutritionType> list, MenuNutritionType t)
|
||||
{
|
||||
return getChildList(list, t).size() > 0 ? true : false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue