Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner
# Conflicts: # coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
This commit is contained in:
@@ -0,0 +1,82 @@
|
||||
package com.cool.store.entity;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.io.Serializable;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author zhangchenbiao
|
||||
* @date 2023-06-08 04:38
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class SysMenuDO implements Serializable {
|
||||
@ApiModelProperty("自增id")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("父级菜单")
|
||||
private Long parentId;
|
||||
|
||||
@ApiModelProperty("菜单编号")
|
||||
private String code;
|
||||
|
||||
@ApiModelProperty("菜单名称")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty("菜单别名")
|
||||
private String alias;
|
||||
|
||||
@ApiModelProperty("请求地址(前端路由)")
|
||||
private String path;
|
||||
|
||||
@ApiModelProperty("后端权限标识")
|
||||
private String perms;
|
||||
|
||||
@ApiModelProperty("菜单资源(图片)")
|
||||
private String source;
|
||||
|
||||
@ApiModelProperty("排序")
|
||||
private Integer sort;
|
||||
|
||||
@ApiModelProperty("菜单类型(菜单,按钮)")
|
||||
private Integer category;
|
||||
|
||||
@ApiModelProperty("操作按钮类型(工具栏,操作栏,工具操作栏)")
|
||||
private Integer action;
|
||||
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty("所属项目(PC,小程序)")
|
||||
private String platform;
|
||||
|
||||
@ApiModelProperty("是否已删除")
|
||||
private Integer isDeleted;
|
||||
|
||||
@ApiModelProperty("操作类型")
|
||||
private String type;
|
||||
|
||||
@ApiModelProperty("是否新开页面")
|
||||
private String target;
|
||||
|
||||
@ApiModelProperty("组件")
|
||||
private String component;
|
||||
|
||||
@ApiModelProperty("图标")
|
||||
private String icon;
|
||||
|
||||
@ApiModelProperty("菜单类型 1菜单 2权限")
|
||||
private Integer menuType;
|
||||
|
||||
@ApiModelProperty("环境")
|
||||
private String env;
|
||||
|
||||
@ApiModelProperty("常用功能_图标")
|
||||
private String commonFunctionsIcon;
|
||||
}
|
||||
@@ -0,0 +1,118 @@
|
||||
package com.cool.store.vo.menu;
|
||||
|
||||
import com.cool.store.entity.SysMenuDO;
|
||||
import com.cool.store.enums.MenuTypeEnum;
|
||||
import com.google.common.collect.Lists;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.collections4.ListUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* describe:
|
||||
*
|
||||
* @author zhouyiping
|
||||
* @date 2020/09/22
|
||||
*/
|
||||
@Data
|
||||
public class MenuTreeVO {
|
||||
|
||||
@ApiModelProperty("请求地址(前端路由)")
|
||||
private String path;
|
||||
|
||||
@ApiModelProperty("菜单编号")
|
||||
private String code;
|
||||
|
||||
@ApiModelProperty("菜单名称")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty("菜单id")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("父级菜单")
|
||||
private Long parentId;
|
||||
|
||||
@ApiModelProperty("是否新开页面")
|
||||
private String target;
|
||||
|
||||
@ApiModelProperty("组件")
|
||||
private String component;
|
||||
|
||||
@ApiModelProperty("图标'")
|
||||
private String icon;
|
||||
|
||||
@ApiModelProperty("常用功能图标")
|
||||
private String commonFunctionsIcon;
|
||||
|
||||
@ApiModelProperty("菜单类型 1菜单 2权限")
|
||||
private Integer menuType;
|
||||
|
||||
@ApiModelProperty("权限列表")
|
||||
private List<String> authorityList;
|
||||
|
||||
@ApiModelProperty("子菜单")
|
||||
private List<MenuTreeVO> children;
|
||||
|
||||
public static List<MenuTreeVO> dealMenuTree(Long rootId, List<SysMenuDO> menuList) {
|
||||
if(CollectionUtils.isEmpty(menuList)){
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
Map<Long, List<SysMenuDO>> parentGroup = ListUtils.emptyIfNull(menuList).stream().collect(Collectors.groupingBy(SysMenuDO::getParentId));
|
||||
List<SysMenuDO> menuDOList = parentGroup.get(rootId);
|
||||
if (CollectionUtils.isEmpty(menuDOList)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
List<MenuTreeVO> voList = convertVO(menuDOList);
|
||||
List<MenuTreeVO> treeVOList = new LinkedList<>(voList);
|
||||
for (MenuTreeVO data : treeVOList) {
|
||||
getChild(data, parentGroup);
|
||||
}
|
||||
return treeVOList;
|
||||
}
|
||||
|
||||
public static List<MenuTreeVO> convertVO(List<SysMenuDO> menuList) {
|
||||
menuList = menuList.stream().sorted(Comparator.comparing(SysMenuDO::getSort)).collect(Collectors.toList());
|
||||
List<MenuTreeVO> resultList = new ArrayList<>();
|
||||
for (SysMenuDO menu : menuList) {
|
||||
MenuTreeVO vo = new MenuTreeVO();
|
||||
vo.setId(menu.getId());
|
||||
vo.setParentId(menu.getParentId());
|
||||
vo.setName(menu.getName());
|
||||
vo.setCode(menu.getType());
|
||||
vo.setPath(menu.getPath());
|
||||
vo.setComponent(menu.getComponent());
|
||||
vo.setTarget(menu.getTarget());
|
||||
vo.setIcon(menu.getIcon());
|
||||
vo.setMenuType(menu.getMenuType());
|
||||
vo.setCommonFunctionsIcon(menu.getCommonFunctionsIcon());
|
||||
resultList.add(vo);
|
||||
}
|
||||
return resultList;
|
||||
}
|
||||
|
||||
public static void getChild(MenuTreeVO data, Map<Long, List<SysMenuDO>> parentGroup) {
|
||||
List<SysMenuDO> sysMenuDOList = parentGroup.get(data.getId());
|
||||
List<SysMenuDO> parentMenuList = ListUtils.emptyIfNull(sysMenuDOList).stream().filter(menu -> MenuTypeEnum.MENU.getCode().equals(menu.getMenuType())).collect(Collectors.toList());
|
||||
List<SysMenuDO> parentAuthList = ListUtils.emptyIfNull(sysMenuDOList).stream().filter(menu -> MenuTypeEnum.AUTH.getCode().equals(menu.getMenuType())).collect(Collectors.toList());
|
||||
//属于菜单下时候
|
||||
if (CollectionUtils.isNotEmpty(parentMenuList)) {
|
||||
List<MenuTreeVO> voList = convertVO(parentMenuList);
|
||||
List<String> authList = parentMenuList.stream().map(SysMenuDO::getType).collect(Collectors.toList());
|
||||
data.setAuthorityList(authList);
|
||||
List<MenuTreeVO> menuList = voList.stream().filter(vo -> MenuTypeEnum.MENU.getCode().equals(vo.getMenuType())).collect(Collectors.toList());
|
||||
data.setChildren(menuList);
|
||||
voList.forEach(child -> {
|
||||
getChild(child, parentGroup);
|
||||
});
|
||||
}
|
||||
//数据是权限的的时候
|
||||
if (CollectionUtils.isNotEmpty(parentAuthList)) {
|
||||
List<String> authList = parentAuthList.stream().map(SysMenuDO::getType).collect(Collectors.toList());
|
||||
data.setAuthorityList(authList);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user