Merge branch 'susu' into dev

This commit is contained in:
주수현
2025-06-23 17:23:22 +09:00
18 changed files with 152 additions and 50 deletions

View File

@@ -24,6 +24,7 @@ public class AdminView implements Serializable {
private Boolean accountDisabled;
private Integer loginFailCnt;
private Boolean accountLocked;
private String lastLoginIp;
private LocalDateTime createdAt;
private String createdBy;
private LocalDateTime updatedAt;

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

@@ -18,12 +18,17 @@
a.account_disabled,
a.login_fail_cnt,
a.account_locked,
liu.clientip as last_login_ip,
a.created_at,
a.created_by,
a.updated_at,
a.updated_by
FROM admin a
WHERE id = #{id}
LEFT JOIN ( SELECT clientip,login_id
FROM logged_in_user liu
ORDER BY last_logged_in_at desc
LIMIT 1 ) liu on liu.login_id = a.id
WHERE a.id = #{id}
AND a.is_deleted = false
</select>

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>

View File

@@ -831,23 +831,26 @@ COMMENT ON COLUMN operation_log.is_deleted IS '삭제여부';
-- ============================================
-- TABLE : logged_in_user
-- DESC : 로그인 사용자 정보 테이블
-- DESC : 로그인 사용자 이력 테이블
-- ============================================
CREATE SEQUENCE logged_in_user_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE logged_in_user (
id bigint DEFAULT nextval('logged_in_user_seq') NOT NULL, -- 로그 ID (PK)
app_type varchar(255) NOT NULL, -- 앱 타입 (FRONT / ADMIN)
id varchar(255) NOT NULL, -- 로그인 아이디
login_id varchar(255) NOT NULL, -- 로그인 아이디
last_logged_in_at timestamp(6), -- 마지막 로그인 날짜
clientip varchar(255), -- 접속 아이피
CONSTRAINT logged_in_user_pkey PRIMARY KEY (app_type, id),
CONSTRAINT logged_in_user_pkey PRIMARY KEY (id),
CONSTRAINT logged_in_user_app_type_check
CHECK (app_type::text = ANY (ARRAY['FRONT', 'ADMIN']))
);
COMMENT ON TABLE logged_in_user IS '로그인사용자정보테이블';
COMMENT ON TABLE logged_in_user IS '로그인사용자이력테이블';
COMMENT ON COLUMN logged_in_user.id IS '로그 ID';
COMMENT ON COLUMN logged_in_user.app_type IS '앱 타입';
COMMENT ON COLUMN logged_in_user.id IS '로그인 아이디';
COMMENT ON COLUMN logged_in_user.login_id IS '로그인 아이디';
COMMENT ON COLUMN logged_in_user.last_logged_in_at IS '마지막 로그인 날짜';
COMMENT ON COLUMN logged_in_user.clientip IS '접속 아이피';