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 new file mode 100644 index 00000000..2230bc18 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -0,0 +1,168 @@ +package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.persistence; + +import app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence.CheckHouseholdNumMapper; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; +import app.module.admin.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateResearcherHasHouseholdCmd; +import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelCreateHouseholdVO; +import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO; +import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortOut; +import app.module.core.config.application.util.AuditUtil; +import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelAdminCreateVO; +import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.SaveAdminHasRoleParam; +import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd; +import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper; +import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; +import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.usermodel.*; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +@Repository +@RequiredArgsConstructor +class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut { + private final CreateHouseholdMapper createHouseholdMapper; + private final CheckHouseholdNumMapper checkHouseholdNumMapper; + private final UICodeListMapper uiCodeListMapper; + + @Override + @Transactional + public ExcelUploadResultVO operate(MultipartFile file) throws IOException { + // 엑셀 파일 읽기 + Workbook workbook = WorkbookFactory.create(file.getInputStream()); + Sheet sheet = workbook.getSheetAt(0); + Integer success = 0; + + List RegionMainCodeList = uiCodeListMapper.findByParentId("code.region.main"); + List RegionSubCodeList = uiCodeListMapper.findByParentId("code.region.sub"); + List RegionDetailCodeList = uiCodeListMapper.findByParentId("code.region.detail"); + List IndustryLargeCodeList = uiCodeListMapper.findByParentId("code.industry.large"); + List IndustryMiddleCodeList = uiCodeListMapper.findByParentId("code.industry.middle"); + + // 첫 번째 행은 헤더로 간주하고 스킵 + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + Row row = sheet.getRow(i); + if (row == null) continue; + + ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO(); + household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호 + household.setOwnerName(getCellValue(row.getCell(1))); // 경영주명 + household.setOwnerAge(getCellNumberValue(row.getCell(2))); // 연령 + + //연락처 는 또 따로 해줘야댐,,, + household.setTel(getDivisionContact(row.getCell(3),"tel")); // 가구 연락처 + household.setPhone(getDivisionContact(row.getCell(3),"phone")); // 연락처 + + //비밀번호도 넣어줘야됨,,, + + household.setRegionMainCode(getRegionMainCode(row.getCell(4),RegionMainCodeList)); // 실사 + household.setRegionSubCode(getUiCode(row.getCell(5),RegionSubCodeList,"code.region.sub")); // 지역 + household.setRegionDetailCode(getUiCode(row.getCell(6),RegionDetailCodeList,"code.region.detail")); // 세부지역 + household.setAddress(getCellValue(row.getCell(7))); // 전체주소 + household.setIndustryLargeCode(getUiCode(row.getCell(8),IndustryLargeCodeList,"code.industry.large")); // 업종 대분류 + household.setIndustryMiddleCode(getUiCode(row.getCell(9),IndustryMiddleCodeList,"code.industry.middle")); // 업종 중분류 + household.setIndustrySubMiddle(getCellValue(row.getCell(10))); // 업종 중분류2 + household.setIndustryDetail(getCellValue(row.getCell(11))); // 규모 / 세부품목 + // household.setResearcherSeq(getCellNumberValue(row.getCell(12))); // 조사원 + //household.setIsPanel(getCellValue(row.getCell(13))); // 유지여부 + + + Optional checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(household.getHouseholdNum())); + + if(checkHouseholdNum.isEmpty()) { + CreateHouseholdOutCmd cmd = new CreateHouseholdOutCmd( + null, + household.getHouseholdNum(), + household.getOwnerName(), + household.getOwnerAge(), + household.getTel(), + household.getPhone(), + household.getPhone(),//패스워드 + household.getRegionMainCode(), + household.getRegionSubCode(), + household.getRegionDetailCode(), + household.getAddress(), + household.getIndustryLargeCode(), + household.getIndustryMiddleCode(), + household.getIndustrySubMiddle(), + household.getIndustryDetail(), + household.getResearcherSeq(), + household.getIsPanel(), + null, + List.of("ROLE_HOUSEHOLD") + ); + + createHouseholdMapper.createHousehold(AuditUtil.create(cmd)); + + if(cmd.getRoleIds() != null && !cmd.getRoleIds().isEmpty()) { + createHouseholdMapper.createHouseholdHasRole(AuditUtil.create(new CreateHouseholdHasRoleCmd(cmd.getSeq(), cmd.getRoleIds()))); + } + + if(cmd.getResearcherSeq() != null) { + createHouseholdMapper.createResearcherHasHousehold(AuditUtil.create(new CreateResearcherHasHouseholdCmd(cmd.getSeq(), cmd.getResearcherSeq()))); + } + } + } + workbook.close(); + return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success); + } + + // 셀 값을 문자열로 변환 + private String getCellValue(Cell cell) { + if (cell == null) return ""; + return switch (cell.getCellType()) { + case STRING -> cell.getStringCellValue(); + case NUMERIC -> String.valueOf((long) cell.getNumericCellValue()); + default -> ""; + }; + } + + // 셀 값을 문자열로 변환 + private Integer getCellNumberValue(Cell cell) { + if (cell == null) return null; + return switch (cell.getCellType()) { + case NUMERIC -> (int) cell.getNumericCellValue(); + default -> null; + }; + } + + private String getUiCode(Cell cell,List uiCodeElementList,String codeId){ + if (cell == null) return ""; + return uiCodeElementList.stream().filter(code -> { + String[] cellValue = cell.getStringCellValue().trim().split("\\."); + return code.getId().equals(codeId+"."+cellValue[0]) || code.getCodeText().equals(cellValue[1]) ; + } ) + .findFirst() + .map(UICodeElement::getId).orElse(""); + } + + private String getRegionMainCode(Cell cell,List uiCodeElementList){ + if (cell == null) return ""; + return uiCodeElementList.stream().filter(code -> code.getCodeText().equals(cell.getStringCellValue().trim())) + .findFirst() + .map(UICodeElement::getId).orElse(""); + } + + private String getDivisionContact(Cell cell,String division){ + if (cell == null) return ""; + String[] divisionContent = cell.getStringCellValue().split("-"); + + if( division.equals("phone") && ( divisionContent[0].equals("010") || divisionContent[0].equals("011") ) ){ + return cell.getStringCellValue(); + }else if(division.equals("tel")){ + return cell.getStringCellValue(); + } + + return ""; + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000..990db2ca --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/ExcelUploadCreateHouseholdController.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web; + +import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; + +@RestController +@RequiredArgsConstructor +class ExcelUploadCreateHouseholdController { + + private final ExcelUploadCreateHouseholdPortIn excelUploadCreateHouseholdPortIn; + + @PostMapping(path = "/api/household/excelUpload") + ResponseEntity operate(@RequestParam("file") MultipartFile file ) throws IOException { + + return ResponseEntity.status(HttpStatus.OK).body(excelUploadCreateHouseholdPortIn.operate(file)); + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..4da6489e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class ExcelCreateHouseholdVO { + private String householdNum; + private String ownerName; + private Integer ownerAge; + private String tel; + private String phone; + private String regionMainCode; + private String regionSubCode; + private String regionDetailCode; + private String address; + private String industryLargeCode; + private String industryMiddleCode; + private String industrySubMiddle; + private String industryDetail; + private Long researcherSeq; + private Boolean isPanel; +} 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 new file mode 100644 index 00000000..e8403fe7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadResultVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class ExcelUploadResultVO { + private Integer total; + private Integer success; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/ExcelUploadCreateHouseholdPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/ExcelUploadCreateHouseholdPortIn.java new file mode 100644 index 00000000..5931e9c8 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/ExcelUploadCreateHouseholdPortIn.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.household.excelUploadCreateHousehold.ports; + +import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; + +public interface ExcelUploadCreateHouseholdPortIn { + ExcelUploadResultVO operate(MultipartFile file) throws IOException; +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/ExcelUploadCreateHouseholdPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/ExcelUploadCreateHouseholdPortOut.java new file mode 100644 index 00000000..7f68e860 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/ExcelUploadCreateHouseholdPortOut.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.household.excelUploadCreateHousehold.ports; + +import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; + +public interface ExcelUploadCreateHouseholdPortOut { + ExcelUploadResultVO operate(MultipartFile file) throws IOException; +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/application/ExcelUploadCreateHouseholdService.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/application/ExcelUploadCreateHouseholdService.java new file mode 100644 index 00000000..c2bf4f81 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/application/ExcelUploadCreateHouseholdService.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.household.excelUploadCreateHousehold.ports.application; + +import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO; +import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortIn; +import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortOut; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; + +@Service +@RequiredArgsConstructor +class ExcelUploadCreateHouseholdService implements ExcelUploadCreateHouseholdPortIn { + private final ExcelUploadCreateHouseholdPortOut portOut; + + @Override + public ExcelUploadResultVO operate(MultipartFile file) throws IOException { + return portOut.operate(file); + } +} \ 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 c0e27ea3..d3d8ffdf 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -217,10 +217,9 @@ } const uploadAdminExcel = () => { - event.preventDefault(); // 폼 기본 제출 방지 + event.preventDefault(); const fileInput = document.getElementById('file'); - if (fileInput.files.length === 0) { alert('업로드할 엑셀 파일을 선택해주세요.'); return; @@ -229,11 +228,6 @@ let formData = new FormData(); formData.append('file', fileInput.files[0]); - const csrfToken = $("meta[name='_csrf']").attr("content"); - const csrfHeader = $("meta[name='_csrf_header']").attr("content"); - - console.log('FormData:', formData); - debugger $.ajax({ method: 'POST', url: '/api/settings/admin/excelUpload', @@ -247,6 +241,14 @@ $("meta[name='_csrf']").attr("content")); }, success(res) { + alert("총 "+res.total+"건 중에 "+res.success+"건 등록되었습니다."); + }, + statusCode: { + 422: (res) => { + const resJson = res.responseJSON; + $(input).parent().find('.invalid-feedback').text(resJson.message); + $(input).addClass('is-invalid'); + } } }); }; @@ -254,6 +256,7 @@ const closeModal = () => { document.querySelector(".modal02").ui.close(); }; +