메뉴 권한 uri 수정

This commit is contained in:
주수현
2025-06-23 16:14:06 +09:00
parent 3809bdca1f
commit 40c59711b5
8 changed files with 92 additions and 27 deletions

View File

@@ -1,5 +1,6 @@
package app.module.admin.config.adapters.web.interceptor;
import app.module.admin.config.application.util.AdminUtil;
import app.module.core.config.adapters.web.interceptor.model.URITopTierVO;
import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.exception.NoMatchingURIException;
@@ -76,16 +77,16 @@ public class AdminURIInterceptor implements HandlerInterceptor {
// 활성 프로파일 가져오기 TODO 2차 오픈시 삭제 예정
modelAndView.addObject("activeProfile", activeProfiles);
String roleId = AdminUtil.getLoginUserRole();
if (!CommonUtil.isAjaxRequest(request)) {
URITopTier topTierOutput = topTierPortIn.connect(AppType.ADMIN);
URITopTier topTierOutput = topTierPortIn.connectRoleId(AppType.ADMIN,roleId);
modelAndView.addObject("topNode", recursiveMapping(topTierOutput));
if (modelAndView.getModelMap().getAttribute("currentURI") == null) {
modelAndView.addObject("currentURI", request.getAttribute("currentURI"));
}
modelAndView.addObject(
"menuHierarchy", uriAncestryPortIn.connect(AppType.ADMIN, request.getRequestURI()));
modelAndView.addObject("menuHierarchy", uriAncestryPortIn.connect(AppType.ADMIN, request.getRequestURI()));
if (cloudFrontDomain != null && bucketFolder != null) {
modelAndView.addObject("S3URL", "https://" + cloudFrontDomain + bucketFolder);

View File

@@ -105,7 +105,7 @@
<!-- 자식 children 가 있는 경우 -->
<th:block th:if="${#lists.size(menu.children) > 0}">
<a th:href="${menu.uri}" th:text="${#messages.msg(menu.id)}">메뉴명</a>
<a href="#" th:text="${#messages.msg(menu.id)}" >메뉴명</a>
<th:block th:insert="~{this :: subMenuFrag}"
th:with="subMenus = ${menu.children}, addSubMenuClass = false">
</th:block>

View File

@@ -9,5 +9,7 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface URIMapper {
URITopTier findTopTierByAppType(@Param("appType") AppType appType);
URITopTier findTopTierByAppTypeByRoleId(@Param("appType") AppType appType,@Param("roleId") String roleId);
List<URITopTier> findChildrenByParentId(@Param("parentId") String parentId);
List<URITopTier> findChildrenByParentIdByRoleId(@Param("parentId") String parentId,@Param("roleId") String roleId);
}

View File

@@ -25,12 +25,33 @@ public class URITopTierDao implements URITopTierPortOut {
return recursiveMapping(top);
}
@Override
@Transactional
public URITopTier connectRoleId(AppType appType, String roleId) {
URITopTier top = uriMapper.findTopTierByAppTypeByRoleId(appType,roleId);
if (top == null) {
throw new RuntimeException("There is no top tier item of " + appType);
}
return recursiveMapping(top,roleId);
}
private URITopTier recursiveMapping(URITopTier current) {
List<URITopTier> children = uriMapper.findChildrenByParentId(current.getId());
current.setChildren(children.stream()
.map(this::recursiveMapping)
.map(this::recursiveMapping)
.collect(Collectors.toList()));
return current;
}
private URITopTier recursiveMapping(URITopTier current,String roleId) {
List<URITopTier> children = uriMapper.findChildrenByParentIdByRoleId(current.getId(),roleId);
current.setChildren(children.stream()
.map(uri -> recursiveMapping(uri,roleId))
.collect(Collectors.toList()));
return current;
}
}

View File

@@ -5,4 +5,5 @@ import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier;
public interface URITopTierPortIn {
URITopTier connect(AppType appType);
URITopTier connectRoleId(AppType appType, String roleId);
}

View File

@@ -6,4 +6,5 @@ import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier;
public interface URITopTierPortOut {
URITopTier connect(AppType appType);
URITopTier connectRoleId(AppType appType,String roleId);
}

View File

@@ -19,4 +19,10 @@ public class URITopTierService implements URITopTierPortIn {
public URITopTier connect(AppType appType) {
return topTierPortOut.connect(appType);
}
@Override
public URITopTier connectRoleId(AppType appType, String roleId) {
return topTierPortOut.connectRoleId(appType,roleId);
}
}

View File

@@ -2,32 +2,65 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="app.module.core.usecase.uri.toptier.adapters.persistence.URIMapper">
<select id="findTopTierByAppType" resultType="app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier">
SELECT
u.id,
u.app_type,
u.text,
u.uri,
u.show_on_navi,
u.order_no
FROM uri u
WHERE u.app_type = #{appType}
AND u.parent_id IS NULL
AND u.is_deleted = false
</select>
<select id="findTopTierByAppType" resultType="app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier">
<select id="findChildrenByParentId" resultType="app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier">
SELECT
u.id,
u.app_type,
u.text,
u.uri,
u.show_on_navi,
u.order_no
FROM uri u
WHERE u.parent_id = #{parentId}
AND u.is_deleted = false
ORDER BY u.order_no ASC
</select>
<select id="findTopTierByAppTypeByRoleId" resultType="app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier">
SELECT
id,
app_type,
text,
uri,
show_on_navi,
order_no
FROM uri
WHERE app_type = #{appType}
AND parent_id IS NULL
AND is_deleted = false
u.id,
u.app_type,
u.text,
u.uri,
u.show_on_navi,
u.order_no
FROM uri u
JOIN uri_has_role uhr ON u.id = uhr.uri_id and uhr.is_deleted = false
WHERE u.app_type = #{appType}
AND u.parent_id IS NULL
AND u.is_deleted = false
AND uhr.role_id = #{roleId}
AND u.show_on_navi = true
</select>
<select id="findChildrenByParentId" resultType="app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier">
<select id="findChildrenByParentIdByRoleId" resultType="app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier">
SELECT
id,
app_type,
text,
uri,
show_on_navi,
order_no
FROM uri
WHERE parent_id = #{parentId}
AND is_deleted = false
ORDER BY order_no ASC
u.id,
u.app_type,
u.text,
u.uri,
u.show_on_navi,
u.order_no
FROM uri u
JOIN uri_has_role uhr ON u.id = uhr.uri_id and uhr.is_deleted = false
WHERE u.parent_id = #{parentId}
AND u.is_deleted = false
AND uhr.role_id = #{roleId}
AND u.show_on_navi = true
ORDER BY u.order_no ASC
</select>
</mapper>