suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复角色菜单临时接口

Browse Source
This commit is contained in:
zhangchenbiao
2023-08-01 14:49:05 +08:00
parent d3a8e2d40e
commit cd46416a3c
8 changed files with 6 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java
View File

@@ -42,11 +42,6 @@ public class AddMenuDTO {
sysMenuDO.setCode(param.getName());
sysMenuDO.setPath(param.getPath());
sysMenuDO.setType(param.getType());
sysMenuDO.setSource("menu");
sysMenuDO.setAction(1);
sysMenuDO.setPlatform("PC");
sysMenuDO.setComponent(param.getComponent());
sysMenuDO.setTarget(param.getTarget());
sysMenuDO.setIcon(param.getIcon());
sysMenuDO.setMenuType(menuTypeEnum.getCode());
return sysMenuDO;

27
coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java
View File

@@ -29,45 +29,21 @@ public class SysMenuDO implements Serializable {
@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;
@@ -76,7 +52,4 @@ public class SysMenuDO implements Serializable {
@ApiModelProperty("环境")
private String env;
@ApiModelProperty("常用功能_图标")
private String commonFunctionsIcon;
}

14
coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java
View File

@@ -35,18 +35,9 @@ public class MenuAuthTreeVO {
@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;
@@ -83,11 +74,8 @@ public class MenuAuthTreeVO {
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;
@@ -100,8 +88,6 @@ public class MenuAuthTreeVO {
//属于菜单下时候
if (CollectionUtils.isNotEmpty(parentMenuList)) {
List<MenuAuthTreeVO> voList = convertVO(parentMenuList);
List<MenuAuthTreeVO> authorityList = convertVO(parentAuthList);
data.setAuthorityList(authorityList);
List<MenuAuthTreeVO> menuList = voList.stream().filter(vo -> MenuTypeEnum.MENU.getCode().equals(vo.getMenuType())).collect(Collectors.toList());
data.setChildren(menuList);
voList.forEach(child -> {

14
coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java
View File

@@ -35,18 +35,9 @@ public class MenuTreeVO {
@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;
@@ -83,11 +74,8 @@ public class MenuTreeVO {
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;
@@ -100,8 +88,6 @@ public class MenuTreeVO {
//属于菜单下时候
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 -> {