diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java index 861ff0d38..9511a73ae 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java @@ -38,7 +38,7 @@ public class SysMenuDAO { * @return */ public Integer batchDeleteMenu(List idList){ - if(CollectionUtils.isNotEmpty(idList)){ + if(CollectionUtils.isEmpty(idList)){ return CommonConstants.ZERO; } return sysMenuMapper.batchDeleteMenu(idList); diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml index b9bf1d810..9bc6310c2 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml @@ -6,27 +6,17 @@ - - - - - - - - - - id, parent_id, code, name, alias, path, perms, source, sort, category, action, remark, - platform, is_deleted, type, target, component, icon, menu_type, env, common_functions_icon + id, parent_id, code, name, path, sort, remark, is_deleted, type, icon, menu_type, env insert into sys_menu @@ -40,45 +30,21 @@ name, - - alias, - path, - - perms, - - - source, - sort, - - category, - - - action, - remark, - - platform, - is_deleted, type, - - target, - - - component, - icon, @@ -88,9 +54,6 @@ env, - - common_functions_icon, - @@ -102,45 +65,21 @@ #{name}, - - #{alias}, - #{path}, - - #{perms}, - - - #{source}, - #{sort}, - - #{category}, - - - #{action}, - #{remark}, - - #{platform}, - #{isDeleted}, #{type}, - - #{target}, - - - #{component}, - #{icon}, @@ -150,9 +89,6 @@ #{env}, - - #{commonFunctionsIcon}, - @@ -168,45 +104,21 @@ name = #{record.name}, - - alias = #{record.alias}, - path = #{record.path}, - - perms = #{record.perms}, - - - source = #{record.source}, - sort = #{record.sort}, - - category = #{record.category}, - - - action = #{record.action}, - remark = #{record.remark}, - - platform = #{record.platform}, - is_deleted = #{record.isDeleted}, type = #{record.type}, - - target = #{record.target}, - - - component = #{record.component}, - icon = #{record.icon}, @@ -216,9 +128,6 @@ env = #{record.env}, - - common_functions_icon = #{record.commonFunctionsIcon}, - where id = #{record.id} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java index 83940e484..e2fc6fda5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java index 4dbd9616f..6892025fc 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java @@ -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; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java index bbc544f1d..d33cb3f4b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java @@ -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 voList = convertVO(parentMenuList); - List authorityList = convertVO(parentAuthList); - data.setAuthorityList(authorityList); List menuList = voList.stream().filter(vo -> MenuTypeEnum.MENU.getCode().equals(vo.getMenuType())).collect(Collectors.toList()); data.setChildren(menuList); voList.forEach(child -> { diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java index 272a5c0f2..d56afc00f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java @@ -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 voList = convertVO(parentMenuList); - List authList = parentMenuList.stream().map(SysMenuDO::getType).collect(Collectors.toList()); - data.setAuthorityList(authList); List menuList = voList.stream().filter(vo -> MenuTypeEnum.MENU.getCode().equals(vo.getMenuType())).collect(Collectors.toList()); data.setChildren(menuList); voList.forEach(child -> { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java index 6cb6515c4..e6f899bb6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java @@ -13,7 +13,6 @@ import com.cool.store.utils.CommonNodeUtils; import com.cool.store.vo.menu.MenuAuthTreeVO; import com.cool.store.vo.menu.MenuTreeVO; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -68,14 +67,9 @@ public class MenuServiceImpl implements MenuService { @Override public Long deleteMenuAuth(Long id) { - List sysMenuDOList = sysMenuDAO.selectMenuAll(null, PlatFormTypeEnum.PC.getCode()); - List idList = ListUtils.emptyIfNull(sysMenuDOList) - .stream() - .map(SysMenuDO::getId) - .collect(Collectors.toList()); - Map> parentGroupMap = ListUtils.emptyIfNull(sysMenuDOList) - .stream() - .collect(Collectors.groupingBy(SysMenuDO::getParentId, Collectors.mapping(SysMenuDO::getId, Collectors.toList()))); + List menuList = sysMenuDAO.selectMenuAll(null, PlatFormTypeEnum.PC.getCode()); + List idList = menuList.stream().map(SysMenuDO::getId).collect(Collectors.toList()); + Map> parentGroupMap = menuList.stream().collect(Collectors.groupingBy(SysMenuDO::getParentId, Collectors.mapping(SysMenuDO::getId, Collectors.toList()))); List allChildList = CommonNodeUtils.getAllChildListContainSelf(0L,id, idList, parentGroupMap); sysMenuDAO.batchDeleteMenu(allChildList); return null; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java index 3fd37a621..92a7dfc2c 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java @@ -52,7 +52,7 @@ public class Swagger2Config { .groupName(groupName) .select() .apis(this.scanBasePackage(packages)) - .paths(PathSelectors.regex(".*/menu/getAllMenus|.*/menu/add|.*/menu/auth/add|.*/role.*")) + //.paths(PathSelectors.regex(".*/menu/.*|.*/role.*")) .build() .globalOperationParameters(pars); }