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] =?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 : 관리자 정보 수정 */