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] =?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