diff --git a/admin/src/main/java/app/module/admin/usecase/admin/excelSaveAdmin/adapters/web/ExcelSaveAdminController.java b/admin/src/main/java/app/module/admin/usecase/admin/excelSaveAdmin/adapters/web/ExcelSaveAdminController.java index 8d2bf46a..6da6fa4a 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/excelSaveAdmin/adapters/web/ExcelSaveAdminController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/excelSaveAdmin/adapters/web/ExcelSaveAdminController.java @@ -21,6 +21,14 @@ class ExcelSaveAdminController { @PostMapping("/api/settings/admin/excelUpload") ResponseEntity excelUploadSaveAdmin(@RequestParam("file") MultipartFile file ) throws IOException { - return ResponseEntity.status(HttpStatus.OK).body(excelSaveAdminPortIn.operate(file)); + try { + return ResponseEntity.status(HttpStatus.OK).body(excelSaveAdminPortIn.operate(file)); + } catch (IOException e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body("엑셀 파일 처리 중 오류가 발생했습니다: " + e.getMessage()); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body("잘못된 데이터 형식입니다: " + e.getMessage()); + } } } 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 4aeb75a1..f933a7e3 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 @@ -188,16 +188,16 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut private String getUiCode(Cell cell,List uiCodeElementList,String codeId){ if (cell == null) return ""; try { - String cellValue = cell.getStringCellValue().trim(); - String[] cellValueParts = cellValue.split("\\."); + String cellValue = cell.getStringCellValue().trim(); + String[] cellValueParts = cellValue.split("\\."); - return uiCodeElementList.stream().filter(code -> { - if(cellValueParts.length == 1 ) return code.getCodeText().equals(codeId+"."+cellValueParts[0]) || code.getCodeText().equals(cellValueParts[0]) ; - if(cellValueParts.length == 2 ) return code.getId().equals(codeId+"."+cellValueParts[0]) || code.getCodeText().equals(cellValueParts[1]) ; - return Boolean.parseBoolean(null); - } ) - .findFirst() - .map(UICodeElement::getId).orElse(""); + return uiCodeElementList.stream().filter(code -> { + if(cellValueParts.length == 1 ) return code.getCodeText().equals(codeId+"."+cellValueParts[0]) || code.getCodeText().equals(cellValueParts[0]) ; + if(cellValueParts.length == 2 ) return code.getId().equals(codeId+"."+cellValueParts[0]) || code.getCodeText().equals(cellValueParts[1]) ; + return Boolean.parseBoolean(null); + } ) + .findFirst() + .map(UICodeElement::getId).orElse(""); } catch (ArrayIndexOutOfBoundsException e) { return null; } @@ -211,7 +211,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut ExcelUploadContactVO contactVO = new ExcelUploadContactVO(); - if(contact[2].length() == 4) { + if(contact.length == 3 && contact[2].length() == 4) { if (contact[0].equals("010") || contact[0].equals("011")) { contactVO.setPhone(getCellValue(cell)); contactVO.setPhoneLast(contact[2]); diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/ExcelUploadCreateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/ExcelUploadCreateHouseholdController.java index 990db2ca..0f12d483 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/ExcelUploadCreateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/ExcelUploadCreateHouseholdController.java @@ -19,7 +19,14 @@ class ExcelUploadCreateHouseholdController { @PostMapping(path = "/api/household/excelUpload") ResponseEntity operate(@RequestParam("file") MultipartFile file ) throws IOException { - - return ResponseEntity.status(HttpStatus.OK).body(excelUploadCreateHouseholdPortIn.operate(file)); + try { + return ResponseEntity.status(HttpStatus.OK).body(excelUploadCreateHouseholdPortIn.operate(file)); + } catch (IOException e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body("엑셀 파일 처리 중 오류가 발생했습니다: " + e.getMessage()); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body("잘못된 데이터 형식입니다: " + e.getMessage()); + } } } \ No newline at end of file diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index 13ff4a31..30c8ae1c 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -215,7 +215,11 @@ // } function showAdminExcelUploadModal() { - const modal = document.querySelector(".modal02"); + const modal = document.querySelector(".modal-admin-excel"); + const fileInput = document.getElementById("file"); + if (fileInput) { + fileInput.value = ''; + } modal.ui.open(); } @@ -248,17 +252,22 @@ alert("총 "+res.total+"건 중에 "+res.success+"건 등록되었습니다."); }, statusCode: { - 422: (res) => { - const resJson = res.responseJSON; - $(input).parent().find('.invalid-feedback').text(resJson.message); - $(input).addClass('is-invalid'); + 400:() => { + ajaxUtil._hideWaiting(); + alert("잘못된 엑셀파일입니다."); + document.querySelector(".modal-admin-excel").ui.close(); + }, + 500: () => { + ajaxUtil._hideWaiting(); + alert("엑셀 업로드에 실패하였습니다."); + document.querySelector(".modal-admin-excel").ui.close(); } } }); }; const closeModal = () => { - document.querySelector(".modal02").ui.close(); + document.querySelector(".modal-admin-excel").ui.close(); }; diff --git a/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html b/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html index fc2a806a..05158f0a 100644 --- a/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html +++ b/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html @@ -3,7 +3,7 @@ layout:decorate="~{layout/layout}">
-
+