From 5aec97e9bde54edb96184e8a7d055bf07b77b6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 30 Jun 2025 19:15:07 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExcelUploadCreateHouseholdDao.java | 21 +++++++++++++------ .../web/model/ExcelCreateHouseholdVO.java | 1 + .../web/model/ExcelUploadResultVO.java | 3 +++ admin/src/main/resources/application.yml | 4 ++++ front/src/main/resources/application.yml | 10 ++++++++- 5 files changed, 32 insertions(+), 7 deletions(-) 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/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/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