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 83616ee1..c292b6ae 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
@@ -32,15 +32,16 @@ public class InitFrontUserData implements ApplicationRunner {
"테스트임가",
58,
null,
- "01011111111",
- "서울",
- "마포구",
- "와와빌딩 2층",
- 14,
- 13,
- 11,
- 10,
- 10,
+ "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 faa90706..5c65bba5 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
@@ -47,22 +47,237 @@ public class InitUICodeData implements ApplicationRunner {
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
- UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 1, "10", "10", null, true),
+ UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 0, "10", "10", null, true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
- UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 2, "20", "20", null, true),
+ UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 1, "20", "20", null, true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
- UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 3, "50", "50", null, true),
+ UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 2, "50", "50", null, true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
- UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 4, "100", "100", null, true),
+ 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/usecase/household/createHousehold/ports/application/CreateHouseholdService.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java
index 30001aa1..4afec35d 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
@@ -27,13 +27,14 @@ class CreateHouseholdService implements CreateHouseholdPortIn {
inCmd.getTel(),
inCmd.getPhone(),
passwordEncoder.encode(StringUtils.right(inCmd.getPhone(), 4)), // 비밀번호 핸드폰 뒤 네자리
- inCmd.getRegion(),
- inCmd.getCity(),
- inCmd.getAddressDetail(),
+ inCmd.getRegionMainCode(),
+ inCmd.getRegionSubCode(),
+ inCmd.getRegionDetailCode(),
+ inCmd.getAddress(),
inCmd.getIndustryLargeCode(),
inCmd.getIndustryMiddleCode(),
- inCmd.getIndustrySmallCode(),
- inCmd.getScaleCode(),
+ inCmd.getIndustrySubMiddleCode(),
+ inCmd.getIndustryDetailCode(),
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 2853dd18..6feb3408 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
@@ -15,13 +15,14 @@ public class CreateHouseholdInCmd {
private Integer ownerAge;
private String tel;
private String phone;
- private String region;
- private String city;
- private String addressDetail;
+ private String regionMainCode;
+ private String regionSubCode;
+ private String regionDetailCode;
+ private String address;
private Integer industryLargeCode;
private Integer industryMiddleCode;
- private Integer industrySmallCode;
- private Integer scaleCode;
+ private Integer industrySubMiddleCode;
+ private Integer industryDetailCode;
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 dcd2a679..267f8059 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
@@ -19,13 +19,14 @@ public class CreateHouseholdOutCmd extends AuditCommand {
private String tel;
private String phone;
private String encodedPassword;
- private String region;
- private String city;
- private String addressDetail;
+ private String regionMainCode;
+ private String regionSubCode;
+ private String regionDetailCode;
+ private String address;
private Integer industryLargeCode;
private Integer industryMiddleCode;
- private Integer industrySmallCode;
- private Integer scaleCode;
+ private Integer industrySubMiddleCode;
+ private Integer industryDetailCode;
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 b9d19e99..7897588b 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
@@ -22,13 +22,14 @@ public class GetHousehold {
private String tel;
private String phone;
private String password;
- private String region;
- private String city;
- private String addressDetail;
+ private String regionMainCode;
+ private String regionSubCode;
+ private String regionDetailCode;
+ private String address;
private Integer industryLargeCode;
private Integer industryMiddleCode;
- private Integer industrySmallCode;
- private Integer scaleCode;
+ private Integer industrySubMiddleCode;
+ private Integer industryDetailCode;
private Integer employmentCode;
private Boolean isPanel;
private String memo;
diff --git a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java
index 62fdc095..bdf63b83 100644
--- a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java
+++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java
@@ -18,7 +18,5 @@ public class UpdateFrontHouseholdCmd extends AuditCommand {
private Integer ownerAge;
private String tel;
private String phone;
- private String region;
- private String city;
- private String addressDetail;
+ private String address;
}
diff --git a/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml
index 91f88ca8..dfce3cea 100644
--- a/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml
+++ b/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml
@@ -17,13 +17,14 @@
tel,
phone,
password,
- region,
- city,
- address_detail,
+ region_main_code,
+ region_sub_code,
+ region_detail_code,
+ address,
industry_large_code,
industry_middle_code,
- industry_small_code,
- scale_code,
+ industry_sub_middle_code,
+ industry_detail_code,
employment_code,
is_panel,
memo,
@@ -37,13 +38,14 @@
#{tel},
#{phone},
#{encodedPassword},
- #{region},
- #{city},
- #{addressDetail},
+ #{regionMainCode},
+ #{regionSubCode},
+ #{regionDetailCode},
+ #{address},
#{industryLargeCode},
#{industryMiddleCode},
- #{industrySmallCode},
- #{scaleCode},
+ #{industrySubMiddleCode},
+ #{industryDetailCode},
#{employmentCode},
#{isPanel},
#{memo},
diff --git a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml
index 7738c982..6eb4ce01 100644
--- a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml
+++ b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml
@@ -14,13 +14,14 @@
tel,
phone,
password,
- region,
- city,
- address_detail,
+ region_main_code,
+ region_sub_code,
+ region_detail_code,
+ address,
industry_large_code,
industry_middle_code,
- industry_small_code,
- scale_code,
+ industry_sub_middle_code,
+ industry_detail_code,
employment_code,
is_panel,
memo,
diff --git a/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml b/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml
index 1431cca7..2f5bb94d 100644
--- a/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml
+++ b/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml
@@ -11,9 +11,7 @@
owner_age = #{ownerAge},
tel = #{tel},
phone = #{phone},
- region = #{region},
- city = #{city},
- address_detail = #{addressDetail},
+ address = #{address},