From 0a73d2fc7864b75388fbeadaaffd2b38f4c0c1c5 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Tue, 10 Jun 2025 22:14:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EA=B0=80=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../initData/InitFrontUserData.java | 38 ++-- .../persistence/initData/InitUICodeData.java | 215 ------------------ .../persistence/initData/RemoveInitData.java | 6 +- .../application/CreateHouseholdService.java | 4 +- .../domain/CreateHouseholdInCmd.java | 4 +- .../domain/CreateHouseholdOutCmd.java | 4 +- .../application/domain/GetHousehold.java | 10 +- .../household/CreateHouseholdMapper.xml | 8 +- .../mappers/household/GetHouseholdMapper.xml | 4 +- .../resources/sql/schema/02_create-all.sql | 24 +- 10 files changed, 52 insertions(+), 265 deletions(-) diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java index c292b6ae..00a5d173 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java @@ -27,24 +27,24 @@ public class InitFrontUserData implements ApplicationRunner { return; } - createHouseholdPortIn.operate(new CreateHouseholdInCmd( - "11111", - "테스트임가", - 58, - null, - "010-1111-1111", - "code.region.main.1", // 서울 - "code.region.sub.31", // 경기도 - "code.region.detail.9", // 경기 - "경기도 성남시 분당구 산성대로 437번길", - null, - null, - null, - null, - null, - true, - null, - null - )); +// createHouseholdPortIn.operate(new CreateHouseholdInCmd( +// "11111", +// "테스트임가", +// 58, +// null, +// "010-1111-1111", +// "code.region.main.1", // 서울 +// "code.region.sub.31", // 경기도 +// "code.region.detail.9", // 경기 +// "경기도 성남시 분당구 산성대로 437번길", +// null, +// null, +// null, +// null, +// null, +// true, +// null, +// null +// )); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java index 5c65bba5..d5b27828 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java @@ -64,220 +64,5 @@ public class InitUICodeData implements ApplicationRunner { new UICodeSaveCommand( UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 3, "100", "100", null, true), false); - - - // 조사 지역 - final String UICODE_REGION = "code.region"; - // 실사 - final String UICODE_REGION_MAIN = "code.region.main"; - - // code - region - uiCodeSavePortIn.connect( - new UICodeSaveCommand(UICODE_REGION, UICODE, 1, "조사 지역", "", null, true), false); - - // code - region - main : 실사 - uiCodeSavePortIn.connect( - new UICodeSaveCommand(UICODE_REGION_MAIN, UICODE_REGION, 0, "실사", "", null, - true), - false); - - // 1. 서울 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_MAIN + ".1", UICODE_REGION_MAIN, 0, "서울", "1", null, true), - false); - - // 2. 강원 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_MAIN + ".2", UICODE_REGION_MAIN, 1, "강원", "2", null, true), - false); - - // 3. 대전 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_MAIN + ".3", UICODE_REGION_MAIN, 2, "대전", "3", null, true), - false); - - // 4. 광주 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_MAIN + ".4", UICODE_REGION_MAIN, 3, "광주", "4", null, true), - false); - - // 5. 대구 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_MAIN + ".5", UICODE_REGION_MAIN, 4, "대구", "5", null, true), - false); - - // 6. 부산 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_MAIN + ".6", UICODE_REGION_MAIN, 5, "부산", "6", null, true), - false); - // 실사 끝 - - - // 지역 시작 - final String UICODE_REGION_SUB = "code.region.sub"; - - // code - region - sub : 지역 - uiCodeSavePortIn.connect( - new UICodeSaveCommand(UICODE_REGION_SUB, UICODE_REGION, 1, "지역", "", null, - true), - false); - - // 31. 경기도 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_SUB + ".31", UICODE_REGION_SUB, 0, "경기도", "31", null, true), - false); - - // 32. 강원도 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_SUB + ".32", UICODE_REGION_SUB, 1, "강원도", "32", null, true), - false); - - // 33. 충청북도 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_SUB + ".33", UICODE_REGION_SUB, 2, "충청북도", "33", null, true), - false); - - // 34. 충청남도 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_SUB + ".34", UICODE_REGION_SUB, 3, "충청남도", "34", null, true), - false); - - // 35. 전라북도 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_SUB + ".35", UICODE_REGION_SUB, 4, "전라북도", "35", null, true), - false); - - // 36. 전라남도 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_SUB + ".36", UICODE_REGION_SUB, 5, "전라남도", "36", null, true), - false); - - // 37. 경상북도 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_SUB + ".37", UICODE_REGION_SUB, 6, "경상북도", "37", null, true), - false); - - // 38. 경상남도 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_SUB + ".38", UICODE_REGION_SUB, 7, "경상남도", "38", null, true), - false); - - // 40. 특광역시 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_SUB + ".40", UICODE_REGION_SUB, 8, "특광역시", "40", null, true), - false); - // 지역 - 끝 - - - // 세부지역 시작 - final String UICODE_REGION_DETAIL = "code.region.detail"; - - // code - region - detail : 세부지역 - uiCodeSavePortIn.connect( - new UICodeSaveCommand(UICODE_REGION_DETAIL, UICODE_REGION, 2, "세부지역", "", null, - true), - false); - - // 2. 부산 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".2", UICODE_REGION_DETAIL, 0, "부산", "2", null, true), - false); - - // 3. 대구 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".3", UICODE_REGION_DETAIL, 1, "대구", "3", null, true), - false); - - // 5. 광주 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".5", UICODE_REGION_DETAIL, 2, "광주", "5", null, true), - false); - - // 6. 대전 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".6", UICODE_REGION_DETAIL, 3, "대전", "6", null, true), - false); - - // 7. 울산 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".7", UICODE_REGION_DETAIL, 4, "울산", "7", null, true), - false); - - // 8. 세종 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".8", UICODE_REGION_DETAIL, 5, "세종", "8", null, true), - false); - - // 9. 경기 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".9", UICODE_REGION_DETAIL, 6, "경기", "9", null, true), - false); - - // 10. 강원 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".10", UICODE_REGION_DETAIL, 7, "강원", "10", null, true), - false); - - // 11. 충북 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".11", UICODE_REGION_DETAIL, 8, "충북", "11", null, true), - false); - - // 12. 충남 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".12", UICODE_REGION_DETAIL, 9, "충남", "12", null, true), - false); - - // 13. 전북 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".13", UICODE_REGION_DETAIL, 10, "전북", "13", null, true), - false); - - // 14. 전남 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".14", UICODE_REGION_DETAIL, 11, "전남", "14", null, true), - false); - - // 15. 경북 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".15", UICODE_REGION_DETAIL, 12, "경북", "15", null, true), - false); - - // 16. 경남 - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_REGION_DETAIL + ".16", UICODE_REGION_DETAIL, 13, "경남", "16", null, true), - false); - - - } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java index 6fa45e2c..f30f9f60 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java @@ -32,8 +32,8 @@ public class RemoveInitData implements ApplicationRunner { mapper.deleteAllAdminHasRole(); mapper.deleteAllAdmin(); - mapper.deleteAllHouseholdHasRole(); - mapper.deleteAllHousehold(); +// mapper.deleteAllHouseholdHasRole(); +// mapper.deleteAllHousehold(); mapper.deleteAllRoleHasPrivilege(); mapper.deleteAllPrivilege(); @@ -44,7 +44,7 @@ public class RemoveInitData implements ApplicationRunner { mapper.deleteAllFrontUserHasRole(); mapper.deleteAllFrontUser(); - mapper.deleteAllRole(); +// mapper.deleteAllRole(); mapper.deleteAllUicode(); } diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java index 4afec35d..18f9a625 100644 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java @@ -33,8 +33,8 @@ class CreateHouseholdService implements CreateHouseholdPortIn { inCmd.getAddress(), inCmd.getIndustryLargeCode(), inCmd.getIndustryMiddleCode(), - inCmd.getIndustrySubMiddleCode(), - inCmd.getIndustryDetailCode(), + inCmd.getIndustrySubMiddle(), + inCmd.getIndustryDetail(), inCmd.getEmploymentCode(), inCmd.getIsPanel(), inCmd.getMemo(), diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java index 6feb3408..5267381b 100644 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java @@ -21,8 +21,8 @@ public class CreateHouseholdInCmd { private String address; private Integer industryLargeCode; private Integer industryMiddleCode; - private Integer industrySubMiddleCode; - private Integer industryDetailCode; + private Integer industrySubMiddle; + private Integer industryDetail; private Integer employmentCode; private Boolean isPanel; private String memo; diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java index 267f8059..39b721b6 100644 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java @@ -25,8 +25,8 @@ public class CreateHouseholdOutCmd extends AuditCommand { private String address; private Integer industryLargeCode; private Integer industryMiddleCode; - private Integer industrySubMiddleCode; - private Integer industryDetailCode; + private Integer industrySubMiddle; + private Integer industryDetail; private Integer employmentCode; private Boolean isPanel; private String memo; diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java index 7897588b..9e384d8b 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java @@ -26,11 +26,11 @@ public class GetHousehold { private String regionSubCode; private String regionDetailCode; private String address; - private Integer industryLargeCode; - private Integer industryMiddleCode; - private Integer industrySubMiddleCode; - private Integer industryDetailCode; - private Integer employmentCode; + private String industryLargeCode; + private String industryMiddleCode; + private String industrySubMiddle; + private String industryDetail; + private String employmentCode; private Boolean isPanel; private String memo; private String dropReason; diff --git a/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml index dfce3cea..58b7ad0a 100644 --- a/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml +++ b/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -23,8 +23,8 @@ address, industry_large_code, industry_middle_code, - industry_sub_middle_code, - industry_detail_code, + industry_sub_middle, + industry_detail, employment_code, is_panel, memo, @@ -44,8 +44,8 @@ #{address}, #{industryLargeCode}, #{industryMiddleCode}, - #{industrySubMiddleCode}, - #{industryDetailCode}, + #{industrySubMiddle}, + #{industryDetail}, #{employmentCode}, #{isPanel}, #{memo}, diff --git a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml index 6eb4ce01..b3995c19 100644 --- a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml +++ b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml @@ -20,8 +20,8 @@ address, industry_large_code, industry_middle_code, - industry_sub_middle_code, - industry_detail_code, + industry_sub_middle, + industry_detail, employment_code, is_panel, memo, diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql index 0f1a4c50..02f2343e 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -272,22 +272,23 @@ CREATE SEQUENCE household_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE household ( seq bigint NOT NULL DEFAULT nextval('household_seq'), -- 가구 일련번호 (PK) household_num varchar(255) NOT NULL, -- 가구 번호 - owner_name varchar(10) NOT NULL, -- 소유자 이름 - owner_age integer NOT NULL, -- 소유자 나이 + owner_name varchar(255) NOT NULL, -- 경영주 이름 + owner_age integer NOT NULL, -- 경영주 나이 tel varchar(20), -- 유선 전화번호 - phone varchar(15) NOT NULL, -- 휴대폰 번호 + phone varchar(255) NOT NULL, -- 휴대폰 번호 password varchar(255) NOT NULL, -- 비밀번호 region_main_code varchar(255), -- 실사(공통코드) region_sub_code varchar(255), -- 지역(공통코드) region_detail_code varchar(255), -- 상세지역(공통코드) address varchar(255), -- 전체 주소 industry_large_code varchar(255), -- 업종 대분류 코드(공통코드) - industry_middle_code varchar(255), -- 업종 중분류 코드(공통코드) - industry_sub_middle_code varchar(255), -- 업종 중분류2 코드(공통코드) - industry_detail_code varchar(255), -- 규모/세부품목 코드(공통코드) + industry_middle_code varchar(255), -- 업종 중분류1 코드(공통코드) + industry_sub_middle varchar(255), -- 업종 중분류2 + industry_detail varchar(255), -- 규모/세부품목 employment_code varchar(255), -- 전/겸업 코드(공통코드) -- TODO: 필요한지 체크 is_panel boolean DEFAULT true, -- 패널 여부 memo varchar(255), -- 메모 + admin_seq bigint, -- 조사원 일련번호 drop_reason varchar(50), -- 탈락 사유 created_at timestamp(6), -- 생성일시 created_by varchar(255), -- 생성자 @@ -303,8 +304,8 @@ CREATE TABLE household ( COMMENT ON TABLE household IS '가구(패널) 정보 테이블'; COMMENT ON COLUMN household.seq IS '가구 일련번호 (PK)'; COMMENT ON COLUMN household.household_num IS '가구 번호'; -COMMENT ON COLUMN household.owner_name IS '소유자 이름'; -COMMENT ON COLUMN household.owner_age IS '소유자 나이'; +COMMENT ON COLUMN household.owner_name IS '경영주 이름'; +COMMENT ON COLUMN household.owner_age IS '경영주 나이'; COMMENT ON COLUMN household.tel IS '유선 전화번호'; COMMENT ON COLUMN household.phone IS '휴대폰 번호'; COMMENT ON COLUMN household.password IS '비밀번호'; @@ -313,12 +314,13 @@ COMMENT ON COLUMN household.region_sub_code IS '지역(공통코드)'; COMMENT ON COLUMN household.region_detail_code IS '상세지역(공통코드)'; COMMENT ON COLUMN household.address IS '전체 주소'; COMMENT ON COLUMN household.industry_large_code IS '업종 대분류 코드(공통코드)'; -COMMENT ON COLUMN household.industry_middle_code IS '업종 중분류 코드(공통코드)'; -COMMENT ON COLUMN household.industry_sub_middle_code IS '업종 중분류2 코드(공통코드)'; -COMMENT ON COLUMN household.industry_detail_code IS '규모/세부품목 코드(공통코드)'; +COMMENT ON COLUMN household.industry_middle_code IS '업종 중분류1 코드(공통코드)'; +COMMENT ON COLUMN household.industry_sub_middle IS '업종 중분류2'; +COMMENT ON COLUMN household.industry_detail IS '규모/세부품목'; COMMENT ON COLUMN household.employment_code IS '전/겸업 코드(공통코드)'; COMMENT ON COLUMN household.is_panel IS '패널 여부'; COMMENT ON COLUMN household.memo IS '메모'; +COMMENT ON COLUMN household.admin_seq IS '조사원 일련번호'; COMMENT ON COLUMN household.drop_reason IS '탈락 사유'; COMMENT ON COLUMN household.created_at IS '생성일시'; COMMENT ON COLUMN household.created_by IS '생성자';