diff --git a/.gitignore b/.gitignore index 8ec211d2..542b46ab 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,7 @@ META-INF .jpd *.log +front/src/main/resources/static/kri_appimg.png +front/src/main/resources/static/kri_favicon.ico +front/src/main/resources/static/manifest.json +front/web/WEB-INF/web.xml diff --git a/README.md b/README.md index 38513630..d8352145 100644 --- a/README.md +++ b/README.md @@ -154,12 +154,13 @@ InitAdminData, InitUriFrontData 등 *ApplicationRunner* 구현체에서 내용 - #### 📡 Ajax 호출 방식 (REST API, JSON 응답) 다음 기능은 Ajax를 통해 REST API(JSON)를 호출합니다 -| 기능 | 메서드 | URI | 예시 | -|------------|------------|------------------------------------|------------------------| -| 목록 조회 | GET | `/api/{resource-name}/list` | `/api/articles/list` | -| 등록 | POST | `/api/{resource-name}/create` | `/api/articles/create` | -| 수정 | PUT/PATCH | `/api/{resource-name}/update` | `/api/articles/update` | -| 삭제 | DELETE | `/api/{resource-name}/remove` | `/api/articles/remove` | +| 기능 | 메서드 | URI | 예시 | +|----------|----------|------------------------------------|------------------------| +| 목록 조회 | GET | `/api/{resource-name}/list` | `/api/articles/list` | +| 등록 | POST | `/api/{resource-name}/create` | `/api/articles/create` | +| 수정 | PUT/PATCH | `/api/{resource-name}/update` | `/api/articles/update` | +| 삭제 | DELETE | `/api/{resource-name}/remove` | `/api/articles/remove` | +| 등록 & 수정 |POST | `/api/{resource-name}/save` | `/api/articles/save` | - #### 🖥️ 서버 렌더링 방식 (SSR) diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 7163d830..11a831da 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -42,6 +43,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut @Transactional public ExcelUploadResultVO operate(MultipartFile file) throws IOException { // 엑셀 파일 읽기 + Workbook workbook = WorkbookFactory.create(file.getInputStream()); Sheet sheet = workbook.getSheetAt(0); Integer success = 0; @@ -52,6 +54,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut List IndustryLargeCodeList = uiCodeListMapper.findByParentId("code.industry.large"); List IndustryMiddleCodeList = uiCodeListMapper.findByParentId("code.industry.middle"); + List errorList = new ArrayList<>(); // 첫 번째 행은 헤더로 간주하고 스킵 for (int i = 1; i <= sheet.getLastRowNum(); i++) { Row row = sheet.getRow(i); @@ -60,9 +63,9 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null); ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3)); - + // 데이터 누락 warn if(!checkHouseholdNum.getIsDuplicated() && contactVO != null) { - + int flag = 0; ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO(); household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호 household.setOwnerName(getCellValue(row.getCell(1))); // 경영주명 @@ -80,7 +83,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut household.setIndustryDetail(getCellValue(row.getCell(11))); // 규모 / 세부품목 household.setResearcherSeq(getResearcherSeq(row.getCell(12))); // 조사원 household.setIsPanel(getIsPanel(row.getCell(13))); // 유지여부 - + household.setMemo(getCellValue(row.getCell(14))); // 비고 CreateHouseholdOutCmd cmd = new CreateHouseholdOutCmd( null, @@ -100,11 +103,17 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut household.getIndustryDetail(), household.getResearcherSeq(), household.getIsPanel(), - null, + household.getMemo(), List.of("ROLE_GENERAL") ); - success += createHouseholdMapper.createHousehold(AuditUtil.create(cmd)); + flag = createHouseholdMapper.createHousehold(AuditUtil.create(cmd)); + + success += flag; + + if(flag == 0){ + errorList.add(household.getHouseholdNum()); + } if(cmd.getRoleIds() != null && !cmd.getRoleIds().isEmpty()) { createHouseholdMapper.createHouseholdHasRole(AuditUtil.create(new CreateHouseholdHasRoleCmd(cmd.getSeq(), cmd.getRoleIds()))); @@ -116,7 +125,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut } } workbook.close(); - return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success); + return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList); } // 셀 값을 문자열로 변환 diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java index b9f61a6d..fd3cef9b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java @@ -24,4 +24,5 @@ public class ExcelCreateHouseholdVO { private String industryDetail; private Long researcherSeq; private Boolean isPanel; + private String memo; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadResultVO.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadResultVO.java index e8403fe7..227400c2 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadResultVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadResultVO.java @@ -4,10 +4,13 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor public class ExcelUploadResultVO { private Integer total; private Integer success; + private List errorList; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java index a1a64984..72db805a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java @@ -13,7 +13,7 @@ public class GetBankAutoTransferExpenseRecords { private Long id; private String categoryText; private String sourcePurpose; - private Integer count; + private String count; private String unitText; private Integer price; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java index 2ba5b126..8802f84d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java @@ -15,7 +15,7 @@ public class GetBankAutoTransferIncomeRecords { private String categoryText; private String target; private String sourcePurpose; - private Integer count; + private String count; private String unitText; private Integer price; } diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml index 5162f6b6..20e1af8a 100644 --- a/admin/src/main/resources/application.yml +++ b/admin/src/main/resources/application.yml @@ -42,6 +42,10 @@ server: mime-types: text/html,text/xml,text/plain,text/css,text/javascript,application/javascript # 압축 적용 최소 응답 크기(바이트) min-response-size: 2048 + servlet: + session: + cookie: + name: ADMIN_SESSION # ============================================== # 관리자 관련 설정 diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index ed886c3f..4846b7f7 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -39,17 +39,25 @@ - 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 97c97f3b..7326ff88 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -277,7 +277,7 @@ CREATE TABLE household ( owner_name varchar(255) NOT NULL, -- 경영주 이름 owner_age integer NOT NULL, -- 경영주 나이 tel varchar(20), -- 유선 전화번호 - phone varchar(255) NOT NULL, -- 휴대폰 번호 + phone varchar(255), -- 휴대폰 번호 password varchar(255) NOT NULL, -- 비밀번호 region_main_code varchar(255), -- 실사(공통코드) region_sub_code varchar(255), -- 지역(공통코드) diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/UpdateUserFrontCmd.java b/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/UpdateUserFrontCmd.java index 6120738c..a069b4df 100644 --- a/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/UpdateUserFrontCmd.java +++ b/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/UpdateUserFrontCmd.java @@ -14,7 +14,7 @@ public class UpdateUserFrontCmd extends AuditCommand { private Integer ownerAge; private String tel; private String phone; - private String regionMainCode; private String regionSubCode; + private String regionDetailCode; private String address; } diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java index 6e0692e9..3f42d32f 100644 --- a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java +++ b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java @@ -42,8 +42,8 @@ class UpdateUserController { reqVO.getOwnerAge(), reqVO.getTel1() + '-'+ reqVO.getTel2() + '-' + reqVO.getTel3(), reqVO.getPhone1() + '-'+ reqVO.getPhone2() + '-' + reqVO.getPhone3(), - reqVO.getRegionMainCode(), reqVO.getRegionSubCode(), + reqVO.getRegionDetailCode(), reqVO.getAddress() )); diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserUIController.java b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserUIController.java index 9a7ab339..7e4eb5e3 100644 --- a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserUIController.java @@ -1,8 +1,7 @@ package app.module.front.usecase.info.userUI.updateUserUI.adapters.web; -import app.module.core.config.application.enums.UiCodeType; import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn; import app.module.front.usecase.info.userFront.getUserFront.ports.GetUserFrontPortIn; import app.module.front.usecase.info.userFront.getUserFront.ports.application.domain.GetUserFrontCmd; import jakarta.servlet.http.HttpServletRequest; @@ -14,12 +13,9 @@ import org.springframework.web.bind.annotation.GetMapping; @Controller @RequiredArgsConstructor class UpdateUserUIController { - - private final UICodeListPortIn uiCodeListPortIn; - + private final UICodeTopTierPortIn uiCodeTopTierPortIn; private final GetUserFrontPortIn getUserPortIn; - @GetMapping(path = "/info/user") String operate(Model model, HttpServletRequest request) { @@ -28,9 +24,8 @@ class UpdateUserUIController { return "redirect:/"; // 요청 처리 중단 } - - model.addAttribute("regionMainList",uiCodeListPortIn.connect(UiCodeType.REGION_MAIN.getCode())); - model.addAttribute("regionSubList",uiCodeListPortIn.connect(UiCodeType.REGION_SUB.getCode())); + // 지역 + 세부지역 공통코드 + model.addAttribute("regionSubList", uiCodeTopTierPortIn.connect("code.region.sub")); model.addAttribute("userInfo", getUserPortIn.operate(new GetUserFrontCmd(CommonUtil.getLoginUsername())).orElseThrow()); diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java index 041b0c64..ed3f7a19 100644 --- a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java @@ -38,12 +38,12 @@ public class UpdateUserReqVO { private String phone3; @NotBlank(message = "지역을 선택해주세요.")//"시/도는 필수 항목입니다.") - @Pattern(regexp = "^code\\.region\\.main\\.\\d+$", message = "지역을 선택해주세요.")//"시/도 형식이 올바르지 않습니다.") - private String regionMainCode; + @Pattern(regexp = "^code\\.region\\.sub\\.\\d+$", message = "지역을 선택해주세요.")//"시/도 형식이 올바르지 않습니다.") + private String regionSubCode; @NotBlank(message = "세부 지역을 선택해주세요.")//"시/군/구는 필수 항목입니다.") - @Pattern(regexp = "^code\\.region\\.sub\\.\\d+$", message = "세부 지역을 선택해주세요.")//"시/군/구 형식이 올바르지 않습니다.") - private String regionSubCode; + @Pattern(regexp = "^code\\.region\\.detail\\.\\d+$", message = "세부 지역을 선택해주세요.")//"시/군/구 형식이 올바르지 않습니다.") + private String regionDetailCode; @NotBlank(message = "전체 주소를 입력해주세요.")//"주소는 필수 항목입니다.") @Size(max = 255, message = "전체 주소를 입력해주세요.")//"주소는 255자 이하여야 합니다.") diff --git a/front/src/main/resources/application.yml b/front/src/main/resources/application.yml index 700cb3a9..6b611ef3 100644 --- a/front/src/main/resources/application.yml +++ b/front/src/main/resources/application.yml @@ -91,4 +91,12 @@ logging: hibernate: orm: jdbc: - bind: trace # Hibernate SQL 파라미터 바인딩 로깅 \ No newline at end of file + bind: trace # Hibernate SQL 파라미터 바인딩 로깅 +# ============================================== +# 서버 압축 설정 +# ============================================== +server: + servlet: + session: + cookie: + name: FRONT_SESSION \ No newline at end of file diff --git a/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml b/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml index 436d59c7..5e1afdf6 100644 --- a/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml +++ b/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml @@ -11,8 +11,8 @@ owner_age = #{ownerAge}, tel = #{tel}, phone = #{phone}, - region_main_code = #{regionMainCode}, region_sub_code = #{regionSubCode}, + region_detail_code = #{regionDetailCode}, address = #{address}, WHERE seq = ${seq} diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js index a3051b5b..5650cf54 100644 --- a/front/src/main/resources/static/ui/commonUtil.js +++ b/front/src/main/resources/static/ui/commonUtil.js @@ -258,4 +258,93 @@ $(function() { $el.val($el.val().replace('.', '')); } }) -}) \ No newline at end of file +}) + +/** + * 공통코드 기반의 2단계 셀렉트박스(부모/자식) UI를 구성하는 함수 + * + * @param {Object} codeList - 공통코드 리스트 객체 + * @param {string} parentSelector - 부모 셀렉트박스 셀렉터 (ex. '#regionSubCode') + * @param {string} childSelector - 자식 셀렉트박스 셀렉터 (ex. '#regionDetailCode') + * @param {string} selectedParentCode - 초기 선택할 부모 코드값 (ex. 'code.region.sub.31') + * @param {string} selectedChildCode - 초기 선택할 자식 코드값 (ex. 'code.region.detail.9') + */ +kri.form.setSelectBoxUiCode = function({ + codeList, + parentSelector, + childSelector, + selectedParentCode = '', + selectedChildCode = '' +}) { + const $parent = $(parentSelector); + const $child = $(childSelector); + + if (!codeList?.nodes || !$parent.length || !$child.length) return; + + const renderOptions = ($el, list, selected, inputSelector) => { + let html = ''; + list.forEach(item => { + const isCurrent = item.id === selected ? 'current' : ''; + html += `
  • ${item.codeText}
  • `; + }); + $el.html(html); + + // 항목 클릭 시 hidden input에 값 반영 + $el.find('li.option').off('click').on('click', function () { + const value = $(this).data('value'); + const text = $(this).text(); + + // 표시 텍스트 업데이트 + $el.closest('.component-select').find('.select-txt').text(text); + + // 선택 클래스 처리 + $el.find('li.option').removeClass('current'); + $(this).addClass('current'); + + // hidden input 값 반영 + $el.closest('.component-select').find('input[data-type="select"]').val(value).trigger('change'); + }); + }; + + let childSelectUI = null; + const loadChildren = (parentId, selectedChild = '') => { + if (!parentId) return; + + const $childEl = document.querySelector(childSelector); + if($childEl.ui){ + $childEl.ui.core.destroy(); + } + + const parent = codeList.nodes.find(n => n.id === parentId); + if (!parent?.nodes) return; + + const $childList = $child.find('ul'); + renderOptions($childList, parent.nodes, selectedChild); + + childSelectUI = etUI.components.SelectBox(); + childSelectUI.core.init($childEl, {}) + }; + + // 초기 렌더링 + const $parentList = $parent.find('ul'); + renderOptions($parentList, codeList.nodes, selectedParentCode); + + const $parentEl = document.querySelector(parentSelector); + const parentSelectUI = new etUI.components.SelectBox(); + parentSelectUI.core.init($parentEl, {}); + + if (selectedParentCode) { + loadChildren(selectedParentCode, selectedChildCode); + } + + // 부모 셀렉션 변경 시 자식 재로드 + $parent.find('ul').on('click', 'li.option', function () { + const newParentCode = $(this).data('value'); + loadChildren(newParentCode); + }); + + return { + getParentValue: () => parentSelectUI.getValue(), + getChildValue: () => childSelectUI?.getValue() ?? '' + }; +} \ No newline at end of file diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html index 5671e4ae..9b71b46e 100644 --- a/front/src/main/resources/templates/info/user/user.html +++ b/front/src/main/resources/templates/info/user/user.html @@ -48,7 +48,7 @@
    - + @@ -130,15 +130,15 @@

    - 도로명 주소 + 주소 *

    -
    - + @@ -152,12 +152,12 @@
      - -
    • option1 -
    • -
      + + + + + +
    @@ -167,29 +167,29 @@
    -
    - +
    + +
    -

    세부지역 선택

    +

    세부 지역 선택

      - -
    • option1 -
    • -
      - + + + + + + +
    @@ -262,6 +262,21 @@