|
|
@@ -23,17 +23,12 @@ import com.xjrsoft.module.system.mapper.AuthorizeMapper;
|
|
|
import com.xjrsoft.module.system.mapper.MenuMapper;
|
|
|
import com.xjrsoft.module.system.mapper.XjrMenuQuickMapper;
|
|
|
import com.xjrsoft.module.system.service.IMenuService;
|
|
|
-import com.xjrsoft.module.system.vo.MenuListVo;
|
|
|
-import com.xjrsoft.module.system.vo.MenuServeVo;
|
|
|
-import com.xjrsoft.module.system.vo.MenuTreeVo;
|
|
|
-import com.xjrsoft.module.system.vo.MenuVo;
|
|
|
+import com.xjrsoft.module.system.vo.*;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
+import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -70,6 +65,35 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
|
|
|
return getSubMenu(menuVos);
|
|
|
}
|
|
|
|
|
|
+ /*
|
|
|
+ 获取所有菜单 标记 accessibility
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public List<MenuAllServeVo> getAuthAllMenuServe(MenuTreeDto dto) {
|
|
|
+ List<Long> roleIdList = new ArrayList<>();
|
|
|
+ roleIdList.add(1L);
|
|
|
+ List<MenuServeVo> roleMenuList = getSubMenu(getAuthMenuByRoleIds(roleIdList, dto));
|
|
|
+
|
|
|
+ List<MenuServeVo> allMenuList = getSubMenu(getAuthMenuList(dto));
|
|
|
+ Map<Long, MenuServeVo> allMenuMap = allMenuList.stream()
|
|
|
+ .collect(Collectors.toMap(MenuServeVo::getId, Function.identity()));
|
|
|
+
|
|
|
+ List<MenuAllServeVo> result = roleMenuList.stream()
|
|
|
+ .map(menu -> convertToMenuAllServeVo(menu, allMenuMap))
|
|
|
+ .collect(Collectors.toList());
|
|
|
+
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ private MenuAllServeVo convertToMenuAllServeVo(MenuServeVo menu, Map<Long, MenuServeVo> allMenuMap) {
|
|
|
+ MenuAllServeVo menuAllServeVo = new MenuAllServeVo();
|
|
|
+ menuAllServeVo.setId(menu.getId());
|
|
|
+ menuAllServeVo.setName(menu.getName());
|
|
|
+ menuAllServeVo.setMenuVoList(menu.getMenuVoList());
|
|
|
+ menuAllServeVo.setAccessibility(allMenuMap.containsKey(menu.getId()) ? 1 : 0);
|
|
|
+ return menuAllServeVo;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 查询角色菜单服务
|
|
|
*/
|