From e7dbb8b938f1465539d32e5eaa32fad583cdfb73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 27 Jun 2025 14:53:23 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=97=91?= =?UTF-8?q?=EC=85=80=20=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(=EB=AA=A8=EB=8B=AC=EC=B0=BD=20=ED=8D=BC?= =?UTF-8?q?=EB=B8=94=20=EC=88=98=EC=A0=95=20=ED=95=84=EC=9A=94,,,)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminIdDuplicateCheckPostController.java | 2 +- .../web/ExcelSaveAdminController.java | 26 +++++ .../web/model/ExcelAdminCreateVO.java | 19 +++ .../resources/templates/admin/adminList.html | 57 +++++++-- .../admin/modal/modal-admin-excel.html | 42 +++++++ .../persistence/ExcelSaveAdminIdDao.java | 110 ++++++++++++++++++ .../persistence/model/ExcelAdminCreateVO.java | 20 ++++ .../persistence/model/ExcelResultVO.java | 15 +++ .../ports/ExcelSaveAdminPortIn.java | 9 ++ .../ports/ExcelSaveAdminPortOut.java | 11 ++ .../application/ExcelSaveAdminService.java | 26 +++++ .../adapters/persistence/SaveAdminMapper.java | 2 +- .../mappers/admin/SaveAdminMapper.xml | 4 +- 13 files changed, 332 insertions(+), 11 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/admin/excelSaveAdmin/adapters/web/ExcelSaveAdminController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/admin/excelSaveAdmin/adapters/web/model/ExcelAdminCreateVO.java create mode 100644 admin/src/main/resources/templates/admin/modal/modal-admin-excel.html create mode 100644 core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/ExcelSaveAdminIdDao.java create mode 100644 core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/model/ExcelAdminCreateVO.java create mode 100644 core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/model/ExcelResultVO.java create mode 100644 core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortIn.java create mode 100644 core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortOut.java create mode 100644 core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/application/ExcelSaveAdminService.java diff --git a/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java b/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java index 1881e478..3b3ce20d 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/checkAdminId/adapters/web/AdminIdDuplicateCheckPostController.java @@ -17,7 +17,7 @@ class AdminIdDuplicateCheckPostController { private final CheckAdminIdPortIn checkAdminIdPortIn; @GetMapping("/api/settings/admin/idCheck") - ResponseEntity updateMappingHousehold(@RequestParam String id ) { + ResponseEntity selectIdCheck(@RequestParam String id ) { return ResponseEntity.status(HttpStatus.OK).body(checkAdminIdPortIn.connect(id)); } } 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 new file mode 100644 index 00000000..8d2bf46a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/admin/excelSaveAdmin/adapters/web/ExcelSaveAdminController.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.admin.excelSaveAdmin.adapters.web; + +import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortIn; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +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; + +@Slf4j +@RestController +@RequiredArgsConstructor +class ExcelSaveAdminController { + + private final ExcelSaveAdminPortIn excelSaveAdminPortIn; + + @PostMapping("/api/settings/admin/excelUpload") + ResponseEntity excelUploadSaveAdmin(@RequestParam("file") MultipartFile file ) throws IOException { + return ResponseEntity.status(HttpStatus.OK).body(excelSaveAdminPortIn.operate(file)); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/admin/excelSaveAdmin/adapters/web/model/ExcelAdminCreateVO.java b/admin/src/main/java/app/module/admin/usecase/admin/excelSaveAdmin/adapters/web/model/ExcelAdminCreateVO.java new file mode 100644 index 00000000..0702ee39 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/admin/excelSaveAdmin/adapters/web/model/ExcelAdminCreateVO.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.admin.excelSaveAdmin.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +public class ExcelAdminCreateVO { + private String id; + private String password; + private String name; + private String phone; + private String regionMainCode; + private String roleId; +} diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index 5514f9a3..c0e27ea3 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -7,7 +7,7 @@
- +
@@ -128,6 +128,9 @@
+ @@ -135,15 +138,10 @@
+
- -
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 new file mode 100644 index 00000000..8d17589a --- /dev/null +++ b/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html @@ -0,0 +1,42 @@ + + + +
+
+ + + +
+
+ +
+
+ \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/ExcelSaveAdminIdDao.java b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/ExcelSaveAdminIdDao.java new file mode 100644 index 00000000..6d2d6f87 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/ExcelSaveAdminIdDao.java @@ -0,0 +1,110 @@ +package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence; + +import app.module.core.config.application.util.AuditUtil; +import app.module.core.usecase.admin.checkAdminId.persistence.CheckAdminIdMapper; +import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelAdminCreateVO; +import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO; +import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortOut; +import app.module.core.usecase.admin.saveAdmin.adapters.persistence.SaveAdminMapper; +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.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.time.LocalDateTime; +import java.util.List; + +@Component +@RequiredArgsConstructor +class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut { + + private final CheckAdminIdMapper checkAdminIdMapper; + private final SaveAdminMapper saveAdminMapper; + private final BCryptPasswordEncoder passwordEncoder; + private final UICodeListMapper uiCodeListMapper; + + @Override + @Transactional + public ExcelResultVO operate(MultipartFile file) throws IOException { + // 엑셀 파일 읽기 + Workbook workbook = WorkbookFactory.create(file.getInputStream()); + Sheet sheet = workbook.getSheetAt(0); + Integer success = 0; + List uiCodeElementList = uiCodeListMapper.findByParentId("code.region.main"); + // 첫 번째 행은 헤더로 간주하고 스킵 + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + Row row = sheet.getRow(i); + if (row == null) continue; + + ExcelAdminCreateVO admin = new ExcelAdminCreateVO(); + admin.setRoleId(getRoleId(row.getCell(0))); // 권한 + admin.setRegionMainCode(getRegionMainCode(row.getCell(1),uiCodeElementList)); // 실사 + admin.setId(getCellValue(row.getCell(2))); // ID + admin.setPassword(getCellValue(row.getCell(3))); // 비밀번호 + admin.setName(getCellValue(row.getCell(4))); // 이름 + admin.setPhone(getCellValue(row.getCell(5))); // 전화번호 + + Integer duplicate = checkAdminIdMapper.checkAdminId(admin.getId()); + + if(duplicate == 0) { + SaveAdminCmd cmd = new SaveAdminCmd( + null, + admin.getId(), + passwordEncoder.encode(admin.getPassword()), + LocalDateTime.now(), + admin.getName(), + admin.getPhone(), + admin.getRegionMainCode(), + false, + 0, + admin.getRoleId() + ); + success += saveAdminMapper.insertAdmin(AuditUtil.create(cmd)); + + if (!admin.getRoleId().isEmpty()) { + saveAdminMapper.insertAdminHasRoles( + AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), admin.getRoleId()))); + } + } + } + + workbook.close(); + return new ExcelResultVO(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 String getRoleId(Cell cell){ + if (cell == null) return ""; + return switch (cell.getStringCellValue().trim()) { + case "관리자" -> "ROLE_ADMIN"; + case "지방실사" -> "ROLE_LOCAL_INSPECTOR"; + case "조사원" -> "ROLE_RESEARCHER"; + default -> ""; + }; + } + + 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(""); + } + +} diff --git a/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/model/ExcelAdminCreateVO.java b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/model/ExcelAdminCreateVO.java new file mode 100644 index 00000000..50afdc04 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/model/ExcelAdminCreateVO.java @@ -0,0 +1,20 @@ +package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +public class ExcelAdminCreateVO { + private Long seq; + private String id; + private String password; + private String name; + private String phone; + private String regionMainCode; + private String roleId; +} diff --git a/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/model/ExcelResultVO.java b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/model/ExcelResultVO.java new file mode 100644 index 00000000..bc78b066 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/adapters/persistence/model/ExcelResultVO.java @@ -0,0 +1,15 @@ +package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +public class ExcelResultVO { + private Integer total; + private Integer success; +} diff --git a/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortIn.java b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortIn.java new file mode 100644 index 00000000..446d2ac0 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortIn.java @@ -0,0 +1,9 @@ +package app.module.core.usecase.admin.excelSaveAdmin.ports; + +import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO; +import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + +public interface ExcelSaveAdminPortIn { + ExcelResultVO operate(MultipartFile file) throws IOException; +} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortOut.java b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortOut.java new file mode 100644 index 00000000..2b757e47 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortOut.java @@ -0,0 +1,11 @@ +package app.module.core.usecase.admin.excelSaveAdmin.ports; + +import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; + +public interface ExcelSaveAdminPortOut { + + ExcelResultVO operate(MultipartFile file) throws IOException; +} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/application/ExcelSaveAdminService.java b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/application/ExcelSaveAdminService.java new file mode 100644 index 00000000..fb33f870 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/application/ExcelSaveAdminService.java @@ -0,0 +1,26 @@ +package app.module.core.usecase.admin.excelSaveAdmin.ports.application; + +import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO; +import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortIn; +import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortOut; +import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; + +@Service +@RequiredArgsConstructor +public class ExcelSaveAdminService implements ExcelSaveAdminPortIn { + + private final ExcelSaveAdminPortOut excelSaveAdminPortOut; + + @Override + public ExcelResultVO operate(MultipartFile file) throws IOException { + + return excelSaveAdminPortOut.operate(file); + } + + +} diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminMapper.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminMapper.java index c6e10b2a..34848413 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminMapper.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SaveAdminMapper { - void insertAdmin(SaveAdminCmd cmd); + Integer insertAdmin(SaveAdminCmd cmd); void updateAdmin(SaveAdminCmd cmd); void insertAdminHasRoles(SaveAdminHasRoleParam param); void deleteAdminRolesByAdminId(DeleteAdminHasRoleParam param); diff --git a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml index 3bf7a07b..c87ddc00 100644 --- a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml +++ b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - + SELECT nextval('admin_seq') @@ -29,7 +29,7 @@ #{accountDisabled}, #{loginFailCnt}, ) - + /* updateAdmin : 관리자 정보 수정 */ From dd55024a0bd026d5b285cad69457812439efe0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 27 Jun 2025 16:47:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9E=84=EA=B0=80=20=EB=93=B1=EB=A1=9D/=20?= =?UTF-8?q?=EC=A1=B0=EC=82=AC=EC=9B=90=20=EB=A7=A4=ED=8C=A1=20=EC=97=91?= =?UTF-8?q?=EC=85=80=20=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EA=B0=9C=EB=B0=9C=EC=A4=91,,,,,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExcelUploadCreateHouseholdDao.java | 168 ++++++++++++++++++ .../ExcelUploadCreateHouseholdController.java | 25 +++ .../web/model/ExcelCreateHouseholdVO.java | 26 +++ .../web/model/ExcelUploadResultVO.java | 13 ++ .../ExcelUploadCreateHouseholdPortIn.java | 10 ++ .../ExcelUploadCreateHouseholdPortOut.java | 10 ++ .../ExcelUploadCreateHouseholdService.java | 21 +++ .../resources/templates/admin/adminList.html | 17 +- 8 files changed, 283 insertions(+), 7 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/ExcelUploadCreateHouseholdController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadResultVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/ExcelUploadCreateHouseholdPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/ExcelUploadCreateHouseholdPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/ports/application/ExcelUploadCreateHouseholdService.java 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(); }; + From 88cd8b900391e752dff8b149365a8a83ba06f0fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 27 Jun 2025 18:55:40 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9E=84=EA=B0=80=20=EB=93=B1=EB=A1=9D/=20?= =?UTF-8?q?=EC=A1=B0=EC=82=AC=EC=9B=90=20=EB=A7=A4=ED=8C=A1=20=EC=97=91?= =?UTF-8?q?=EC=85=80=20=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/CreateHouseholdMapper.java | 2 +- .../ExcelUploadCreateHouseholdDao.java | 106 ++++++++++-------- .../web/model/ExcelCreateHouseholdVO.java | 1 + .../web/model/ExcelUploadContactVO.java | 15 +++ .../persistence/ResearcherMapper.java | 2 +- .../household/CreateHouseholdMapper.xml | 4 +- .../household/GetPopupResearchersMapper.xml | 1 + .../mappers/researcher/ResearcherMapper.xml | 8 ++ .../templates/households/households.html | 4 + .../modal/modal-excel-household.html | 85 ++++++++++++++ .../persistence/UICodeListMapper.java | 1 + .../mappers/uicode/UICodeListMapper.xml | 16 +++ 12 files changed, 195 insertions(+), 50 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadContactVO.java create mode 100644 admin/src/main/resources/templates/households/modal/modal-excel-household.html diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java index f6da0d55..42ec09f8 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface CreateHouseholdMapper { - void createHousehold(CreateHouseholdOutCmd outCmd); + Integer createHousehold(CreateHouseholdOutCmd outCmd); void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd); void createResearcherHasHousehold(CreateResearcherHasHouseholdCmd cmd); } 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 2230bc18..7163d830 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 @@ -8,31 +8,35 @@ import app.module.admin.usecase.household.createHousehold.ports.application.doma 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.ExcelUploadContactVO; import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO; import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortOut; +import app.module.admin.usecase.researcher.adpaters.persistence.ResearcherMapper; 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 lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.*; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; 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.Arrays; import java.util.List; import java.util.Optional; +@Slf4j @Repository @RequiredArgsConstructor class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut { private final CreateHouseholdMapper createHouseholdMapper; private final CheckHouseholdNumMapper checkHouseholdNumMapper; private final UICodeListMapper uiCodeListMapper; + private final BCryptPasswordEncoder passwordEncoder; + private final ResearcherMapper researcherMapper; @Override @Transactional @@ -44,7 +48,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut List RegionMainCodeList = uiCodeListMapper.findByParentId("code.region.main"); List RegionSubCodeList = uiCodeListMapper.findByParentId("code.region.sub"); - List RegionDetailCodeList = uiCodeListMapper.findByParentId("code.region.detail"); + List RegionDetailCodeList = uiCodeListMapper.findByLikeId("code.region.detail"); List IndustryLargeCodeList = uiCodeListMapper.findByParentId("code.industry.large"); List IndustryMiddleCodeList = uiCodeListMapper.findByParentId("code.industry.middle"); @@ -53,32 +57,31 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut 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))); // 유지여부 + CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null); + ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3)); - Optional checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(household.getHouseholdNum())); + if(!checkHouseholdNum.getIsDuplicated() && contactVO != null) { + + ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO(); + household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호 + household.setOwnerName(getCellValue(row.getCell(1))); // 경영주명 + household.setOwnerAge(getCellNumberValue(row.getCell(2))); // 연령 + household.setTel(contactVO.getTel()); // 가구 연락처 + household.setPhone(contactVO.getPhone()); // 연락처 + household.setEncodedPassword(passwordEncoder.encode(contactVO.getPhoneLast())); // 비밀번호 + household.setRegionMainCode(getUiCode(row.getCell(4),RegionMainCodeList,"code.region.main")); // 실사 + 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(getResearcherSeq(row.getCell(12))); // 조사원 + household.setIsPanel(getIsPanel(row.getCell(13))); // 유지여부 + - if(checkHouseholdNum.isEmpty()) { CreateHouseholdOutCmd cmd = new CreateHouseholdOutCmd( null, household.getHouseholdNum(), @@ -86,7 +89,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut household.getOwnerAge(), household.getTel(), household.getPhone(), - household.getPhone(),//패스워드 + household.getEncodedPassword(), household.getRegionMainCode(), household.getRegionSubCode(), household.getRegionDetailCode(), @@ -98,10 +101,10 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut household.getResearcherSeq(), household.getIsPanel(), null, - List.of("ROLE_HOUSEHOLD") + List.of("ROLE_GENERAL") ); - createHouseholdMapper.createHousehold(AuditUtil.create(cmd)); + success += createHouseholdMapper.createHousehold(AuditUtil.create(cmd)); if(cmd.getRoleIds() != null && !cmd.getRoleIds().isEmpty()) { createHouseholdMapper.createHouseholdHasRole(AuditUtil.create(new CreateHouseholdHasRoleCmd(cmd.getSeq(), cmd.getRoleIds()))); @@ -145,24 +148,35 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut .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 ExcelUploadContactVO getDivisionContact(Cell cell){ + if (cell == null) return null; + + String[] contact = cell.getStringCellValue().trim().split("-"); + + ExcelUploadContactVO contactVO = new ExcelUploadContactVO(); + + if(contact[2].length() == 4) { + if (contact[0].equals("010") || contact[0].equals("011")) { + contactVO.setPhone(getCellValue(cell)); + contactVO.setPhoneLast(contact[2]); + } else { + contactVO.setTel(getCellValue(cell)); + contactVO.setPhoneLast(contact[2]); + } + return contactVO; + } + return null; } - private String getDivisionContact(Cell cell,String division){ - if (cell == null) return ""; - String[] divisionContent = cell.getStringCellValue().split("-"); + private Boolean getIsPanel(Cell cell){ + if (cell == null) return null; + String[] isPanel = cell.getStringCellValue().trim().split("\\."); + return "1".equals(isPanel[0]) || "유지".equals(isPanel[1]); + } - if( division.equals("phone") && ( divisionContent[0].equals("010") || divisionContent[0].equals("011") ) ){ - return cell.getStringCellValue(); - }else if(division.equals("tel")){ - return cell.getStringCellValue(); - } - - return ""; + private Long getResearcherSeq(Cell cell){ + if (cell == null) return null; + return researcherMapper.selectResearcherId(cell.getStringCellValue()); } } \ 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 index 4da6489e..b9f61a6d 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 @@ -13,6 +13,7 @@ public class ExcelCreateHouseholdVO { private Integer ownerAge; private String tel; private String phone; + private String encodedPassword; private String regionMainCode; private String regionSubCode; private String regionDetailCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadContactVO.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadContactVO.java new file mode 100644 index 00000000..16c84060 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadContactVO.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class ExcelUploadContactVO { + private String phone; + private String tel; + private String phoneLast; + +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java index 0eb5e6d4..ad01f66c 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java @@ -27,5 +27,5 @@ public interface ResearcherMapper { void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy); Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy); List getPopupHouseholds(@Param("pageable") Pageable pageable, @Param("cmd") GetPopupHouseholdsCmd cmd); - + Long selectResearcherId(@Param("id")String id); } diff --git a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml index 2e9fa3e8..8da3bc93 100644 --- a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml +++ b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -4,7 +4,7 @@ - + /* createHousehold : 임가 등록 */ SELECT nextval('household_seq') @@ -79,7 +79,7 @@ ) - + /* createHouseholdHasRole : 임가 역할 등록 */ diff --git a/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml b/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml index 50910655..256101ec 100644 --- a/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml +++ b/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml @@ -31,6 +31,7 @@ AND a.name ILIKE '%' || #{cmd.searchValue} || '%' + AND a.phone ILIKE '%' || #{cmd.searchValue} || '%' diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index d3ee37ca..388df9db 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -357,4 +357,12 @@ ORDER BY hvr.householdNum ASC OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index 004cab2c..92a927b3 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -284,6 +284,9 @@
+ @@ -302,6 +305,7 @@
+
diff --git a/admin/src/main/resources/templates/households/modal/modal-excel-household.html b/admin/src/main/resources/templates/households/modal/modal-excel-household.html new file mode 100644 index 00000000..99117318 --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-excel-household.html @@ -0,0 +1,85 @@ + + + +
+
+ + +
+ + + +
+ \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListMapper.java b/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListMapper.java index a3075dca..63371733 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListMapper.java @@ -8,4 +8,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface UICodeListMapper { List findByParentId(@Param("parentId") String parentId); + List findByLikeId(@Param("id") String id); } diff --git a/core/src/main/resources/mappers/uicode/UICodeListMapper.xml b/core/src/main/resources/mappers/uicode/UICodeListMapper.xml index 8758e31d..c45553f2 100644 --- a/core/src/main/resources/mappers/uicode/UICodeListMapper.xml +++ b/core/src/main/resources/mappers/uicode/UICodeListMapper.xml @@ -19,4 +19,20 @@ ORDER BY order_no ASC + + \ No newline at end of file