[BO] 임가현황 리스트, 상세 작업 중 (2)

This commit is contained in:
kangsunlee
2025-06-13 19:15:58 +09:00
parent 4df2e17ab2
commit 1891ce5541
42 changed files with 644 additions and 86 deletions

View File

@@ -38,16 +38,16 @@ public class InitAdminData implements ApplicationRunner {
false,
List.of("ROLE_ADMIN"));
// 연구원
// 지방실사
saveAdminPortIn.connect(
null,
"test-analyst",
"analyst1@#$",
"analyst@framework.org",
"test-local-inspection",
"local1@#$",
"local@framework.org",
"code.region.main.1",
false,
false,
List.of("ROLE_ANALYST"));
List.of("ROLE_LOCAL_INSPECTION"));
// 조사원
saveAdminPortIn.connect(

View File

@@ -43,8 +43,8 @@ public class InitRoleData implements ApplicationRunner {
roleSavePortIn.connect(
AppType.ADMIN,
"ROLE_ANALYST",
"연구원",
"ROLE_LOCAL_INSPECTION",
"지방실사",
orderNo++,
List.of("ADMIN_API", "ADMIN_ACCESS"));

View File

@@ -106,7 +106,7 @@ public class InitUriAdminData implements ApplicationRunner {
"메인",
"/",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
// `1` depth URI 정의 - 시작
@@ -117,7 +117,7 @@ public class InitUriAdminData implements ApplicationRunner {
"임가 현황",
"/household",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -126,7 +126,7 @@ public class InitUriAdminData implements ApplicationRunner {
"조사원 현황",
"/researcher",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION"));
appendURI(
AppType.ADMIN,
@@ -135,7 +135,7 @@ public class InitUriAdminData implements ApplicationRunner {
"대시보드",
"/dashboard",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -153,7 +153,7 @@ public class InitUriAdminData implements ApplicationRunner {
"게시판",
"/board",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -192,7 +192,7 @@ public class InitUriAdminData implements ApplicationRunner {
"임가 현황",
"/household/households",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -201,7 +201,7 @@ public class InitUriAdminData implements ApplicationRunner {
"임가 등록",
"/household/households/create",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -210,7 +210,7 @@ public class InitUriAdminData implements ApplicationRunner {
"임가 상세",
"/household/households/{{pathVar}}",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
// 조사원 현황 메뉴 시작
appendURI(
@@ -220,7 +220,7 @@ public class InitUriAdminData implements ApplicationRunner {
"조사원 현황",
"/researcher/researchers",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION"));
appendURI(
AppType.ADMIN,
@@ -229,7 +229,7 @@ public class InitUriAdminData implements ApplicationRunner {
"조사원 등록",
"/researcher/researchers/create",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION"));
appendURI(
AppType.ADMIN,
@@ -238,7 +238,7 @@ public class InitUriAdminData implements ApplicationRunner {
"조사원 상세",
"/researcher/researchers/view/{{pathVar}}",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION"));
// 대시보드
appendURI(
@@ -248,7 +248,7 @@ public class InitUriAdminData implements ApplicationRunner {
"대시보드",
"/dashboard",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
// 커뮤니케이션 메뉴 시작
appendURI(
@@ -313,7 +313,7 @@ public class InitUriAdminData implements ApplicationRunner {
"예제 게시판",
"/board/articles",
true,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -322,7 +322,7 @@ public class InitUriAdminData implements ApplicationRunner {
"예제 게시판 등록",
"/board/articles/create",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -331,7 +331,7 @@ public class InitUriAdminData implements ApplicationRunner {
"예제 게시판 수정",
"/board/articles/{{pathVar}}",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -340,7 +340,7 @@ public class InitUriAdminData implements ApplicationRunner {
"예제 게시판 삭제",
"/board/articles/delete",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
appendURI(
AppType.ADMIN,
@@ -349,7 +349,7 @@ public class InitUriAdminData implements ApplicationRunner {
"예제 게시판 엑셀 다운로드",
"/board/articles/excel",
false,
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
// 예제 게시판 - 끝
// 분석 메뉴 시작

View File

@@ -88,17 +88,6 @@ public class CommonUtil {
return username;
}
public static String getLoginUserRole() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) return null;
return authentication.getAuthorities().stream()
.map(GrantedAuthority::getAuthority)
.filter(authStr -> authStr.startsWith("ROLE_"))
.findFirst()
.orElse(null);
}
public static HttpServletRequest getRequest() {
HttpServletRequest request = null;
if (RequestContextHolder.getRequestAttributes() != null) {

View File

@@ -4,41 +4,41 @@
INSERT INTO privilege
(id, description, app_type, order_no, created_at, created_by, updated_at, updated_by, is_deleted)
VALUES
('ADMIN_API', 'ADMIN API 이용 권한', 'ADMIN', 0, CURRENT_TIMESTAMP, 'INIT_DATA',CURRENT_TIMESTAMP, 'INIT_DATA',false),
('ADMIN_ACCESS', 'ADMIN 사이트 접근 권한', 'ADMIN', 1, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false),
('FRONT_API', 'Front API 사용권한', 'FRONT', 0, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false),
('FRONT_ACCESS', 'Front 사이트 접근 권한', 'FRONT', 1, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false);
('ADMIN_API', 'ADMIN API 이용 권한', 'ADMIN', 0, NOW(), 'INIT_DATA',NOW(), 'INIT_DATA',false),
('ADMIN_ACCESS', 'ADMIN 사이트 접근 권한', 'ADMIN', 1, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false),
('FRONT_API', 'Front API 사용권한', 'FRONT', 0, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false),
('FRONT_ACCESS', 'Front 사이트 접근 권한', 'FRONT', 1, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false);
-- 역할
INSERT INTO role
(id, description, app_type, order_no, created_at, created_by, updated_at, updated_by, is_deleted)
VALUES
('ROLE_ADMIN', '관리자', 'ADMIN', 0, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false),
('ROLE_ANALYST', '연구원', 'ADMIN', 1, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false),
('ROLE_RESEARCHER', '조사원', 'ADMIN', 2, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false),
('ROLE_GENERAL', '일반 사용자', 'FRONT', 0, CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA', false);
('ROLE_ADMIN', '관리자', 'ADMIN', 0, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false),
('ROLE_LOCAL_INSPECTION', '지방실사', 'ADMIN', 1, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false),
('ROLE_RESEARCHER', '조사원', 'ADMIN', 2, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false),
('ROLE_GENERAL', '일반 사용자', 'FRONT', 0, NOW(), 'INIT_DATA', NOW(), 'INIT_DATA', false);
-- 역할 권한 매핑
INSERT INTO role_has_privilege
(role_id, privilege_id, created_at, created_by, updated_at, updated_by, is_deleted)
VALUES
-- ROLE_ADMIN
('ROLE_ADMIN', 'ADMIN_API', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_ADMIN', 'ADMIN_API', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
('ROLE_ADMIN', 'ADMIN_ACCESS', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_ADMIN', 'ADMIN_ACCESS', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
-- ROLE_ANALYST
('ROLE_ANALYST', 'ADMIN_API', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
-- ROLE_LOCAL_INSPECTION
('ROLE_LOCAL_INSPECTION', 'ADMIN_API', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
('ROLE_ANALYST', 'ADMIN_ACCESS', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_LOCAL_INSPECTION', 'ADMIN_ACCESS', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
-- ROLE_RESEARCHER
('ROLE_RESEARCHER', 'ADMIN_API', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_RESEARCHER', 'ADMIN_API', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
('ROLE_RESEARCHER', 'ADMIN_ACCESS', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_RESEARCHER', 'ADMIN_ACCESS', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
-- ROLE_GENERAL
('ROLE_GENERAL', 'FRONT_API', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_GENERAL', 'FRONT_API', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false),
('ROLE_GENERAL', 'FRONT_ACCESS', CURRENT_TIMESTAMP, 'INIT_DATA', CURRENT_TIMESTAMP, 'INIT_DATA',
('ROLE_GENERAL', 'FRONT_ACCESS', NOW(), 'INIT_DATA', NOW(), 'INIT_DATA',
false);

View File

@@ -34,9 +34,9 @@ values
INSERT INTO admin_has_role (admin_seq, role_id, created_at, created_by, is_deleted)
VALUES (1, 'ROLE_ADMIN', NOW(), 'INIT_DATA', false);
-- 연구원
-- 지방실사
INSERT INTO admin_has_role (admin_seq, role_id, created_at, created_by, is_deleted)
VALUES (2, 'ROLE_ANALYST', NOW(), 'INIT_DATA', false);
VALUES (2, 'ROLE_LOCAL_INSPECTION', NOW(), 'INIT_DATA', false);
-- 조사원
INSERT INTO admin_has_role (admin_seq, role_id, created_at, created_by, is_deleted)

View File

@@ -0,0 +1,32 @@
-- drop function
DROP FUNCTION IF EXISTS get_status(boolean, varchar, bigint);
-- ============================================
-- FUNCTION : get_status
-- DESC : 일계부 항목별 상태값 리턴용 공통 함수
-- PARAMS :
-- - is_future_day : 미래 날짜 여부
-- - status : 상태 문자열 (TARGET, TODAY_NONE 등)
-- - cnt : 등록 건수
-- RETURN : 텍스트 ('3건', '등록없음', '미작성', '-')
-- ============================================
CREATE OR REPLACE FUNCTION get_status(
is_future_day boolean,
status varchar,
cnt bigint
)
RETURNS text AS $$
BEGIN
IF is_future_day THEN
RETURN '-';
ELSIF status = 'TARGET' AND cnt > 0 THEN
RETURN cnt || '건';
ELSIF status = 'TARGET' AND cnt = 0 THEN
RETURN '등록없음';
ELSIF status IN ('TODAY_NONE', 'NONE') THEN
RETURN '등록없음';
ELSE
RETURN '미작성';
END IF;
END;
$$ LANGUAGE plpgsql;